Merge branch 'depends/driver-core' into ux500/dt
authorArnd Bergmann <arnd@arndb.de>
Fri, 16 Mar 2012 19:15:48 +0000 (19:15 +0000)
committerArnd Bergmann <arnd@arndb.de>
Fri, 16 Mar 2012 19:15:48 +0000 (19:15 +0000)
Conflicts:
drivers/base/cpu.c


Trivial merge