Merge branch 'for_3.2/pm-cleanup-2' of git://github.com/khilman/linux-omap-pm into...
authorTony Lindgren <tony@atomide.com>
Sat, 5 Nov 2011 00:40:52 +0000 (17:40 -0700)
committerTony Lindgren <tony@atomide.com>
Sat, 5 Nov 2011 00:40:52 +0000 (17:40 -0700)
1  2 
arch/arm/mach-omap2/id.c
arch/arm/mach-omap2/pm34xx.c
arch/arm/plat-omap/include/plat/cpu.h

Simple merge
Simple merge
Simple merge