]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'ux500/fixes-3.5' into fixes
authorArnd Bergmann <arnd@arndb.de>
Fri, 6 Jul 2012 19:44:51 +0000 (21:44 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 6 Jul 2012 19:44:51 +0000 (21:44 +0200)
commit945af56256ad186243b26e17ecd685405f5d5654
tree2034f2391e323ffb501ea0ddfc99e78f8874b672
parent718412d99cba2d8d454a7d113a327dc093664c66
parent953dfc1ded95d7193ec215d73bddc12da1296026
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>