From: Jens Axboe <jaxboe@fusionio.com>
Date: Wed, 10 Nov 2010 13:51:27 +0000 (+0100)
Subject: Merge branch 'for-2.6.37/drivers' into for-linus
X-Git-Tag: v2.6.37-rc2~30^2~3
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=00e375e7e962f938f6b3c93e4cd097a5e26cc788;p=linux-2.6-block.git

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

Conflicts:
	drivers/block/cciss.c

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

00e375e7e962f938f6b3c93e4cd097a5e26cc788