Russell King 4ec3eb1363 Merge branch 'smp' into misc ... Conflicts: arch/arm/kernel/entry-armv.S arch/arm/mm/ioremap.c		2011-01-06 22:32:03 +00:00
..
asm	Merge branch 'smp' into misc	2011-01-06 22:32:03 +00:00