Merge branch 'stericsson/fixes' into next/cleanup

Conflicts:
	arch/arm/mach-ux500/cpu.c
This commit is contained in:
Arnd Bergmann 2011-10-08 21:47:06 +02:00
commit a3849a4c03
2 changed files with 25 additions and 1 deletions