Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
commitaceb91cd351bc3a19a783c901fe8a8070d5f6fa9
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 9 Feb 2011 19:45:21 +0000 (9 11:45 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 9 Feb 2011 19:45:21 +0000 (9 11:45 -0800)
treea0863e940a77ae10d3c8b391488e29a8245b31be
parentae8eed2d0906bf0d8eb0c2a4651676a41d361297
parentb8cf0e0e552ca48e9a00f518aeb4f5e03984022b
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  cdrom: support devices that have check_events but not media_changed
  cfq-iosched: Don't wait if queue already has requests.
  blkio-throttle: Avoid calling blkiocg_lookup_group() for root group
  cfq: rename a function to give it more appropriate name
  cciss: make cciss_revalidate not loop through CISS_MAX_LUNS volumes unnecessarily.
  drivers/block/aoe/Makefile: replace the use of <module>-objs with <module>-y
  loop: queue_lock NULL pointer derefence in blk_throtl_exit
  drivers/block/Makefile: replace the use of <module>-objs with <module>-y
  blktrace: Don't output messages if NOTIFY isn't set.