Merge branch 'ux500/soc' into ux500/dt
authorArnd Bergmann <arnd@arndb.de>
Fri, 16 Mar 2012 19:13:58 +0000 (19:13 +0000)
committerArnd Bergmann <arnd@arndb.de>
Fri, 16 Mar 2012 19:13:58 +0000 (19:13 +0000)

Trivial merge