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)
commitf949c0edd84101bfd30b3e7389c1a12b067e561d
treeba39033c089a66a8d4ac058f3f03a8ed2a488f91
parent119c4b1257e44d9ec981465ccb80aba427a96dda
parent92d2040d78f662f634efce7a5106bbed70b8708b
Merge branch 'master' into devel
arch/arm/Kconfig
arch/arm/mach-mx2/devices.c