Merge branch 'pm-sr' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman...
authorTony Lindgren <tony@atomide.com>
Wed, 22 Dec 2010 23:08:05 +0000 (15:08 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 22 Dec 2010 23:08:05 +0000 (15:08 -0800)
1  2 
arch/arm/mach-omap2/control.h

Simple merge