Merge branch 'mcpm' of git://git.linaro.org/people/nico/linux into devel-stable
Russell King [Thu, 25 Apr 2013 08:42:42 +0000 (09:42 +0100)]
1  2 
arch/arm/Kconfig
arch/arm/kernel/asm-offsets.c

Simple merge
Simple merge