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)
commit172c11351576cf5daa8f1b02a265bf84de8bbed1
tree5bd75dc35bfced691abdef92bde861ca246b4321
parent9af2ebbd09e01bd2711617dcafce5f608cace6ec
parent0aed043517ad4135cb458a46e9e99e21cbb59c69
Merge branch 'pm-next' of ssh:///linux/kernel/git/khilman/linux-omap-pm into omap-for-linus
arch/arm/mach-omap2/Makefile
arch/arm/plat-omap/include/plat/omap_hwmod.h
arch/arm/plat-omap/omap_device.c