Merge branch 'master' into devel
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 24 May 2010 22:08:54 +0000 (23:08 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 24 May 2010 22:08:54 +0000 (23:08 +0100)
1  2 
arch/arm/Kconfig
arch/arm/mach-mx2/devices.c

Simple merge
Simple merge