Merge branch 'omap_chip_remove_cleanup_3.2' of git://git.pwsan.com/linux-2.6 into...
authorTony Lindgren <tony@atomide.com>
Thu, 15 Sep 2011 23:06:11 +0000 (16:06 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 15 Sep 2011 23:06:11 +0000 (16:06 -0700)
commitceb1c532ba6220900e61ec7073a9234661efa450
treeb7c5b94f09a6893625bb12b7795de3d44fece450
parent8f5b5a41ebc750ffcc2c410371b2b4998955709e
parent00c46b3069c1ee9aa31db3057e9224685af52efa
Merge branch 'omap_chip_remove_cleanup_3.2' of git://git.pwsan.com/linux-2.6 into cleanup
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/io.c