From: Linus Walleij <linus.walleij@linaro.org>
Date: Thu, 29 Aug 2013 07:46:30 +0000 (+0200)
Subject: Merge tag 'v3.11-rc7' into devel
X-Git-Tag: v3.12-rc1~151^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ad30ce046aefbdc3848232c665a728860d7bb68;p=pandora-kernel.git

Merge tag 'v3.11-rc7' into devel

Merged in this to avoid conflicts with the big locking fixes
from upstream.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

Conflicts:
	drivers/pinctrl/pinctrl-sunxi.c
---

6ad30ce046aefbdc3848232c665a728860d7bb68
Reading git-diff-tree failed