tree 739f445b953aa77e82a429fe3a939d0b4cb3d222
parent dc79d2f21a2dc19df26f0cb0b46be2d6241b627b
parent 4b27e1bb442e964903f8a3fa6bdf33a602dc0941
author Linus Torvalds <torvalds@linux-foundation.org> 1257300981 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1257300981 -0800

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

* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  cfq-iosched: limit coop preemption
  cfq-iosched: fix bad return value cfq_should_preempt()
  backing-dev: bdi sb prune should be in the unregister path, not destroy
  Fix bio_alloc() and bio_kmalloc() documentation
  bio_put(): add bio_clone() to the list of functions in the comment