From: Jens Axboe <jaxboe@fusionio.com>
Date: Tue, 1 Mar 2011 20:04:39 +0000 (-0500)
Subject: Merge commit 'v2.6.38-rc6' into for-2.6.39/core
X-Git-Tag: v2.6.39-rc1~80^2~50
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6fae9c25134baffbeeb20031479e7ff6f6d8eec0;p=pandora-kernel.git

Merge commit 'v2.6.38-rc6' into for-2.6.39/core

Conflicts:
	block/cfq-iosched.c

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

6fae9c25134baffbeeb20031479e7ff6f6d8eec0
Reading git-diff-tree failed