Russell King 2e0e943436 Merge branch 'devel-stable' into for-linus ... Conflicts: arch/arm/kernel/setup.c arch/arm/mach-shmobile/board-kota2.c		2012-01-05 13:24:33 +00:00
..
asm	Merge branch 'devel-stable' into for-linus	2012-01-05 13:24:33 +00:00