tree a3811697f5eba3c5d12216ac76f681420046b219
parent 0f1bce41fed02e45f31c2409f29e69e1fedebcdc
parent 75065ff619e42fe35178eda863cbcddd57776794
author Linus Torvalds <torvalds@linux-foundation.org> 1210268916 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1210268916 -0700

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

* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  Revert "relay: fix splice problem"
  docbook: fix bio missing parameter
  block: use unitialized_var() in bio_alloc_bioset()
  block: avoid duplicate calls to get_part() in disk stat code
  cfq-iosched: make io priorities inherit CPU scheduling class as well as nice
  block: optimize generic_unplug_device()
  block: get rid of likely/unlikely predictions in merge logic
  vfs: splice remove_suid() cleanup
  cfq-iosched: fix RCU race in the cfq io_context destructor handling
  block: adjust tagging function queue bit locking
  block: sysfs store function needs to grab queue_lock and use queue_flag_*()