Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 18 Dec 2007 16:04:24 +0000 (08:04 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 18 Dec 2007 16:04:24 +0000 (08:04 -0800)
commit3c615e19a4c518e349cc81a7f43223c7ec5f9e9a
tree45326cb0f8b8b67d2e8123151e5c8c34d28b1587
parent57680915a6f2324c008b6213fe12b74507b3fcd0
parent458cf5e9b666c251b04cb5242fb19fd5114645ba
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