Merge branch 'for-2.6.37/drivers' into for-linus

author Jens Axboe <[email protected]>

Wed, 10 Nov 2010 13:51:27 +0000 (14:51 +0100)

committer Jens Axboe <[email protected]>

Wed, 10 Nov 2010 13:51:27 +0000 (14:51 +0100)
author Jens Axboe <[email protected]>
Wed, 10 Nov 2010 13:51:27 +0000 (14:51 +0100)
committer Jens Axboe <[email protected]>
Wed, 10 Nov 2010 13:51:27 +0000 (14:51 +0100)
diff --cc drivers/block/cciss.c
Simple merge
diff --cc drivers/block/drbd/drbd_int.h
Simple merge
diff --cc drivers/block/drbd/drbd_main.c
Simple merge
author	Jens Axboe <[email protected]>
	Wed, 10 Nov 2010 13:51:27 +0000 (14:51 +0100)
committer	Jens Axboe <[email protected]>
	Wed, 10 Nov 2010 13:51:27 +0000 (14:51 +0100)
		1	2
drivers/block/cciss.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/block/drbd/drbd_int.h	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/block/drbd/drbd_main.c	patch \|	diff1 \|	diff2 \|	blob \| history