Merge branch 'for-2.6.37/drivers' into for-linus
Jens Axboe [Wed, 10 Nov 2010 13:51:27 +0000 (14:51 +0100)]
Conflicts:
drivers/block/cciss.c

Signed-off-by: Jens Axboe <jaxboe@fusionio.com>

1  2 
drivers/block/cciss.c
drivers/block/drbd/drbd_int.h
drivers/block/drbd/drbd_main.c

Simple merge
Simple merge
Simple merge