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