Merge branch 'stable/for-jens' of git://git.kernel.org/pub/scm/linux/kernel/git/konra...
authorJens Axboe <jaxboe@fusionio.com>
Tue, 9 Aug 2011 18:43:26 +0000 (20:43 +0200)
committerJens Axboe <jaxboe@fusionio.com>
Tue, 9 Aug 2011 18:43:26 +0000 (20:43 +0200)
commit40bb96ade4ef1549f387625589175def31dc9023
tree1b02671145e225e54354ffeb0ee7fe2afe3c4339
parentfa1bf42ff9296ac4cf211b0a1b450a6071d26a95
parentea5e116162b7e0cf83a2b8a273440514404604de
Merge branch 'stable/for-jens' of git://git./linux/kernel/git/konrad/xen into for-linus
drivers/block/Kconfig