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

Simple merge
Simple merge