The following commit has been merged in the linux branch: commit 51bb296b09a83ee1aae025778db38f9d2cc7bb1a Merge: dc79d2f21a2dc19df26f0cb0b46be2d6241b627b 4b27e1bb442e964903f8a3fa6bdf33a602dc0941 Author: Linus Torvalds torvalds@linux-foundation.org Date: Tue Nov 3 18:16:21 2009 -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