Merge branch 'pm-opp' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman...
authorTony Lindgren <tony@atomide.com>
Wed, 22 Dec 2010 01:05:57 +0000 (17:05 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 22 Dec 2010 01:05:57 +0000 (17:05 -0800)
commitb9e7683bbca638967a56e5d7fd4035a947109621
tree3d02725c6e6bb3d77e1c34a04d5179ea4ee2509e
parentbb3613aa34a81a5e2f1227ccdb801fde04a7da10
parent53da4ce23809ca33405001b0ae117e60b7feced1
Merge branch 'pm-opp' of ssh:///linux/kernel/git/khilman/linux-omap-pm into omap-for-linus
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/pm.h