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: firefly_0821_release~7613^2~3345^2~8
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=00e375e7e962f938f6b3c93e4cd097a5e26cc788;p=firefly-linux-kernel-4.4.55.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