From: Linus Walleij <linus.walleij@linaro.org>
Date: Wed, 3 Apr 2013 20:18:36 +0000 (+0200)
Subject: Merge tag 'v3.9-rc5' into devel
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6a7b3e970426f4bc2a8d52f81a4fda6595a9f052;p=linux-beck.git

Merge tag 'v3.9-rc5' into devel

Linux 3.9-rc5

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

6a7b3e970426f4bc2a8d52f81a4fda6595a9f052