Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 1 Feb 2008 10:48:45 +0000 (21:48 +1100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 1 Feb 2008 10:48:45 +0000 (21:48 +1100)
commit24e1c13c93cbdd05e4b7ea921c0050b036555adc
tree60e5b54f1ce6db72507e6f20f19bffe5854793b8
parent31fa5d2868cfa6b51e39989e2a2ab99ce4566cb2
parent3bc217ffe6774e7971d6a7ce6350ce806ebab044
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  block: kill swap_io_context()
  as-iosched: fix inconsistent ioc->lock context
  ide-cd: fix leftover data BUG
  block: make elevator lib checkpatch compliant
  cfq-iosched: make checkpatch compliant
  block: make core bits checkpatch compliant
  block: new end request handling interface should take unsigned byte counts
  unexport add_disk_randomness
  block/sunvdc.c:print_version() must be __devinit
  splice: always updated atime in direct splice