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)
1  2 
arch/arm/mach-omap2/pm34xx.c

Simple merge