From: Tony Lindgren <tony@atomide.com>
Date: Wed, 29 Jun 2011 11:45:16 +0000 (-0700)
Subject: Merge branch 'for_3.1/pm-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilm... 
X-Git-Tag: v3.1-rc1~152^2~9
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48cb1258e8b0f8c81cfb699b42326c5b2147b3f8;p=pandora-kernel.git

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
---

48cb1258e8b0f8c81cfb699b42326c5b2147b3f8
Reading git-diff-tree failed