From: NeilBrown <neilb@suse.com>
Date: Sat, 5 Sep 2015 09:07:04 +0000 (+0200)
Subject: Merge linux-block/for-4.3/core into md/for-linux
X-Git-Tag: omap-for-v4.3/fixes-rc1~84^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e89c6fdf9e0eb1b5a03574d4ca73e83eae8deb91;p=pandora-kernel.git

Merge linux-block/for-4.3/core into md/for-linux

There were a few conflicts that are fairly easy to resolve.

Signed-off-by: NeilBrown <neilb@suse.com>
---

e89c6fdf9e0eb1b5a03574d4ca73e83eae8deb91
Reading git-diff-tree failed