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)
commita3849a4c038a21075a0bc7eaf37f65a93976d10c
tree77e1148cdd719856dcf1692f8d9167691347d17b
parent71f2c153755442c05d15cd025484f676a5f3541f
parent1bf6d2c1bb23533af6930581cc39b74685bc29de
Merge branch 'stericsson/fixes' into next/cleanup

Conflicts:
arch/arm/mach-ux500/cpu.c
arch/arm/mach-ux500/cache-l2x0.c
This page took 0.028842 seconds and 5 git commands to generate.