From: Jens Axboe <axboe@kernel.dk>
Date: Wed, 19 Oct 2011 12:30:42 +0000 (+0200)
Subject: Merge branch 'v3.1-rc10' into for-3.2/core
X-Git-Tag: v3.2-rc1~49^2~19
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c04b426f2e8b46cfc7969a35b2631063a3c646c;p=pandora-kernel.git

Merge branch 'v3.1-rc10' into for-3.2/core

Conflicts:
	block/blk-core.c
	include/linux/blkdev.h

Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

5c04b426f2e8b46cfc7969a35b2631063a3c646c
Reading git-diff-tree failed