Merge git://git.linaro.org/nico/arm_security into devel-stable
authorRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 30 Jun 2010 10:00:01 +0000 (11:00 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 30 Jun 2010 10:00:01 +0000 (11:00 +0100)
1  2 
arch/arm/Kconfig

Simple merge