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)
commit7fd92b56e5508fc3453ac9a65e11561178e86330
tree8fad9740a733326b580f4a39ddaac84ae5e6674d
parent2cbb6160b56038aad0ce0b05bed7a75d6f086171
parent3047454475adca98e30e00dfca21021a0de99d78
Merge branch 'for_3.2/pm-cleanup-2' of git://github.com/khilman/linux-omap-pm into fixes
arch/arm/mach-omap2/id.c
arch/arm/mach-omap2/pm34xx.c
arch/arm/plat-omap/include/plat/cpu.h