Russell King 742eaa6a6e Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into devel-stable ... Conflicts: arch/arm/common/gic.c arch/arm/plat-omap/include/plat/common.h		2011-12-05 23:20:17 +00:00
..
asm	Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into devel-stable	2011-12-05 23:20:17 +00:00