Merge branch 'pm-upstream/debug' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorTony Lindgren <tony@atomide.com>
Wed, 2 Sep 2009 22:23:05 +0000 (15:23 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 2 Sep 2009 22:23:05 +0000 (15:23 -0700)
commit5567fa1f543dde3c42f8e52bf4f7005135b24896
treef4e2815758d5dd15f75a6c1523c1abc50966cdcb
parentd3d381c6365ef5b06c4184a3fe047cf027533970
parent68d4778c701b7e22ddfd64e3afb6628c92718ad2
Merge branch 'pm-upstream/debug' of git://git./linux/kernel/git/khilman/linux-omap-pm into for-next
arch/arm/mach-omap2/pm34xx.c