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-Tag: omap-for-v3.10/dt-fixes-for-merge-window~141^2~20
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a7b3e970426f4bc2a8d52f81a4fda6595a9f052;p=pandora-kernel.git

Merge tag 'v3.9-rc5' into devel

Linux 3.9-rc5

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

6a7b3e970426f4bc2a8d52f81a4fda6595a9f052
Reading git-diff-tree failed