Merge branch 'ux500/fixes-3.5' into next/dt
authorArnd Bergmann <arnd@arndb.de>
Tue, 17 Jul 2012 21:33:22 +0000 (23:33 +0200)
committerArnd Bergmann <arnd@arndb.de>
Tue, 17 Jul 2012 21:33:22 +0000 (23:33 +0200)
prerequisite for ux500/dt branch

1  2 
drivers/of/platform.c

Simple merge