Russell King 3c0c01ab74 Merge branch 'devel-stable' into for-next ... Conflicts: arch/arm/Makefile arch/arm/include/asm/glue-proc.h		2013-06-29 11:44:43 +01:00
..
asm	Merge branch 'devel-stable' into for-next	2013-06-29 11:44:43 +01:00
debug	Merge branch 'for-rmk/hugepages' of git://git.linaro.org/people/stevecapper/linux into devel-stable	2013-06-18 20:05:48 +01:00
uapi/asm	Merge branch 'for-rmk/lpae' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into devel-stable	2013-06-18 20:11:32 +01:00