Merge branch 'for_3.1/pm-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilm...
authorTony Lindgren <tony@atomide.com>
Wed, 29 Jun 2011 11:45:16 +0000 (04:45 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 29 Jun 2011 11:45:16 +0000 (04:45 -0700)
commit48cb1258e8b0f8c81cfb699b42326c5b2147b3f8
tree6dc560f24eec8d303534d86b1e20d037df94a68d
parent332acd9e534e0bc8713d2cb90dd2d4d5f2485401
parentec3cdb5baedf6bb3852c531426c1e95a13671dff
Merge branch 'for_3.1/pm-misc' of git://git./linux/kernel/git/khilman/linux-omap-pm into devel-cleanup

Conflicts:
arch/arm/mach-omap2/pm-debug.c
arch/arm/mach-omap2/pm.h
arch/arm/mach-omap2/board-omap3pandora.c
arch/arm/mach-omap2/pm-debug.c
arch/arm/mach-omap2/pm.h
arch/arm/mach-omap2/pm34xx.c