Russell King 7b70c4275f Merge branch 'devel-stable' into devel ... Conflicts: arch/arm/kernel/entry-armv.S arch/arm/kernel/setup.c arch/arm/mm/init.c		2010-07-31 14:20:16 +01:00
..
asm	Merge branch 'devel-stable' into devel	2010-07-31 14:20:16 +01:00