From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 6 Jul 2012 19:44:51 +0000 (+0200)
Subject: Merge branch 'ux500/fixes-3.5' into fixes
X-Git-Tag: upstream/snapshot3+hdmi~7102^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=78ee225fc1706821370f1147de4ce323f912f3a7;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge branch 'ux500/fixes-3.5' into fixes

From Lee Jones <lee.jones@linaro.org>:

* ux500/fixes-3.5:
  ARM: ux500: Over-ride the DT device naming scheme for pinctrl
  ARM: ux500: Fix build errors/warnings when MACH_UX500_DT is not set
  of: address: Don't fail a lookup just because a node has no reg property

I ended up rebasing Lee's branch on 3.5-rc5 because we have more patches
lined for 3.6 that depend on them, and I want to keep all branches in
arm-soc be based on -rc releases rather than random commits in the
upstream history.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

78ee225fc1706821370f1147de4ce323f912f3a7