Merge branches 'cleanup-part3', 'voltage', 'dmtimer' and 'l3' into dt-base
authorTony Lindgren <tony@atomide.com>
Tue, 4 Oct 2011 16:47:06 +0000 (09:47 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 4 Oct 2011 16:47:06 +0000 (09:47 -0700)
commitc541c15fb5ab48c47bc9b90121538fd30d152f23
tree5a303080d4729666b709711b65d7fc24b948ad64
parent5c30cdfa41821dd89792600118cab5c02a5c322b
parentbe73246058737beec52ae232bcab7776332a9e06
parent7d33910262d2b4e36742985269456bd519b38d46
parentab4eb8b098c7591459b066cec0325a63792e463b
parentdc9ca24f4d7a5ff33d7e12ca809564d37188212b
Merge branches 'cleanup-part3', 'voltage', 'dmtimer' and 'l3' into dt-base
arch/arm/mach-omap2/board-2430sdp.c
arch/arm/mach-omap2/board-4430sdp.c
arch/arm/mach-omap2/hsmmc.c
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
arch/arm/mach-omap2/pm.c
arch/arm/mach-omap2/sr_device.c
arch/arm/mach-omap2/timer.c
arch/arm/mach-omap2/usb-musb.c
arch/arm/plat-omap/include/plat/io.h