tree 6dc560f24eec8d303534d86b1e20d037df94a68d
parent 332acd9e534e0bc8713d2cb90dd2d4d5f2485401
parent ec3cdb5baedf6bb3852c531426c1e95a13671dff
author Tony Lindgren <tony@atomide.com> 1309347916 -0700
committer Tony Lindgren <tony@atomide.com> 1309347916 -0700

Merge branch 'for_3.1/pm-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into devel-cleanup

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