Merge branch 'for_3.3/fixes/pm' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorTony Lindgren <tony@atomide.com>
Fri, 17 Feb 2012 23:08:20 +0000 (15:08 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 17 Feb 2012 23:08:20 +0000 (15:08 -0800)
1  2 
arch/arm/mach-omap2/Kconfig
arch/arm/mach-omap2/io.c

Simple merge
Simple merge