diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-07-06 21:44:51 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-06 21:44:51 +0200 |
| commit | 78ee225fc1706821370f1147de4ce323f912f3a7 (patch) | |
| tree | 2034f2391e323ffb501ea0ddfc99e78f8874b672 /arch/mips | |
| parent | e15ebe05cce44c5164dbf8489841c18a887bcfc2 (diff) | |
| parent | 2b667a2d8005e7c8362a77365cedbcd71fa5d6c1 (diff) | |
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>
Diffstat (limited to 'arch/mips')
0 files changed, 0 insertions, 0 deletions