Merge branch 'stericsson/fixes' into next/cleanup
authorArnd Bergmann <arnd@arndb.de>
Sat, 8 Oct 2011 19:47:06 +0000 (21:47 +0200)
committerArnd Bergmann <arnd@arndb.de>
Sat, 8 Oct 2011 19:47:06 +0000 (21:47 +0200)
Conflicts:
arch/arm/mach-ux500/cpu.c


Trivial merge