Merge branch 'for_2.6.36' of git://git.pwsan.com/linux-2.6 into omap-for-linus
authorTony Lindgren <tony@atomide.com>
Wed, 4 Aug 2010 05:46:24 +0000 (08:46 +0300)
committerTony Lindgren <tony@atomide.com>
Wed, 4 Aug 2010 05:46:24 +0000 (08:46 +0300)
commit331d919af416b9b92428947ef8c535a3e24c6b31
tree1f58dfe4ea6ed130f7b970f07cd7589864e9cbad
parent047b51fb208c716294b4682c904df8a3ad8b6a69
parentfb8ce14c7e16bd218decb3e1655c5d4ff08042f2
Merge branch 'for_2.6.36' of git://git.pwsan.com/linux-2.6 into omap-for-linus
arch/arm/mach-omap1/Kconfig
arch/arm/mach-omap1/clock_data.c
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/io.c