Russell King 6ae25a5b9d Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux into devel-stable ... Conflicts: arch/arm/mm/ioremap.c		2011-12-08 18:02:04 +00:00
..
asm	Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux into devel-stable	2011-12-08 18:02:04 +00:00