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)
1  2 
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/pm.h

Simple merge
Simple merge