From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 18 Dec 2007 16:04:24 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
X-Git-Tag: v2.6.24-rc6~19
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=3c615e19a4c518e349cc81a7f43223c7ec5f9e9a;p=linux-2.6-omap-h63xx.git

Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  Cleanup umem driver: fix most checkpatch warnings, conform to kernel
  block: let elv_register() return void
  as-iosched: fix write batch start point
  as-iosched: fix incorrect comments
  block: use jiffies conversion functions in scsi_ioctl.c
---

3c615e19a4c518e349cc81a7f43223c7ec5f9e9a