From: Jens Axboe <jens.axboe@oracle.com>
Date: Thu, 25 Feb 2010 07:48:05 +0000 (+0100)
Subject: Merge branch 'master' into for-2.6.34
X-Git-Tag: v2.6.34-rc1~242^2~21
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f03292ee16e68be96aa88904afc6152f8d37736;p=pandora-kernel.git

Merge branch 'master' into for-2.6.34

Conflicts:
	include/linux/blkdev.h

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
---

7f03292ee16e68be96aa88904afc6152f8d37736
Reading git-diff-tree failed