Merge branch 'for_2.6.39/pm-integration' of ssh://master.kernel.org/pub/scm/linux...
authorTony Lindgren <tony@atomide.com>
Fri, 11 Mar 2011 17:39:58 +0000 (09:39 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 11 Mar 2011 17:39:58 +0000 (09:39 -0800)
commit0d9596958d0be59e6bb373b5e6bc0729cbba5110
tree516886b4e5a626c4b8c6d013e631b7234ef34128
parenta2358a7bc35e388978fc2f7f6b071a0fd27d78c1
parent5e7c58dc8d9b7f31d418cf98c6a8cad84b86f510
Merge branch 'for_2.6.39/pm-integration' of ssh:///linux/kernel/git/khilman/linux-omap-pm into omap-for-linus
arch/arm/mach-omap2/opp3xxx_data.c
arch/arm/mach-omap2/opp4xxx_data.c
arch/arm/mach-omap2/pm34xx.c