tree 60e5b54f1ce6db72507e6f20f19bffe5854793b8
parent 31fa5d2868cfa6b51e39989e2a2ab99ce4566cb2
parent 3bc217ffe6774e7971d6a7ce6350ce806ebab044
author Linus Torvalds <torvalds@linux-foundation.org> 1201862925 +1100
committer Linus Torvalds <torvalds@linux-foundation.org> 1201862925 +1100

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