Merge branch 'pm-hwmods' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman...
authorTony Lindgren <tony@atomide.com>
Fri, 8 Oct 2010 17:20:40 +0000 (10:20 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 8 Oct 2010 17:20:40 +0000 (10:20 -0700)
commitbc3caae8a191c712d8ae666d0b8d18807bfe2b14
tree7b338ebba2f1fdbcee3785789bf9f4a74d93aa94
parent73c5ef126f40b0b872e5964ff65dbe792eeec493
parent69758ab7a1e2de5636a2188d5357dd03140bf1d8
Merge branch 'pm-hwmods' of ssh:///linux/kernel/git/khilman/linux-omap-pm into omap-for-linus
arch/arm/mach-omap1/devices.c
arch/arm/mach-omap2/board-3630sdp.c
arch/arm/mach-omap2/board-zoom-peripherals.c
arch/arm/mach-omap2/devices.c
arch/arm/mach-omap2/pm34xx.c