Merge branch 'pm-runtime' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman...
authorTony Lindgren <tony@atomide.com>
Fri, 24 Sep 2010 00:29:36 +0000 (17:29 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 24 Sep 2010 00:29:36 +0000 (17:29 -0700)
1  2 
arch/arm/mach-omap2/Makefile

Simple merge