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)
commitb0ee4e394009f02a1d1b166091a19e8b842b4ea4
tree75e6df725e5402ed6fe9d78f23bf5cf45cfdf9d9
parentabe763f2bccbc592d33a3a9c334acaefea022c0a
parent03e4fd6eb25e6b46536ecdb0d1b7d33d46b15480
Merge branch 'for_3.3/fixes/pm' of git://git./linux/kernel/git/khilman/linux-omap-pm into fixes
arch/arm/mach-omap2/Kconfig
arch/arm/mach-omap2/io.c