Merge branch 'omap-for-v3.8/pm' into omap-for-v3.8/clock
authorTony Lindgren <tony@atomide.com>
Tue, 13 Nov 2012 21:25:38 +0000 (13:25 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 13 Nov 2012 21:25:38 +0000 (13:25 -0800)
commit89ab216b33ba9405880fd3d89531305a931bc70f
tree8f6428ce51ecaed6f6e1379c036dbe341eb71e34
parentc9d501e5cb0238910337213e12a09127221c35d8
parent46bf4a562207c5ebd24e1dde5e5ee326cd3d6b91
Merge branch 'omap-for-v3.8/pm' into omap-for-v3.8/clock
15 files changed:
arch/arm/mach-omap2/board-omap3beagle.c
arch/arm/mach-omap2/clock33xx_data.c
arch/arm/mach-omap2/clock3xxx_data.c
arch/arm/mach-omap2/clock44xx_data.c
arch/arm/mach-omap2/control.h
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
arch/arm/mach-omap2/omap_opp_data.h
arch/arm/mach-omap2/omap_twl.c
arch/arm/mach-omap2/pm.c
arch/arm/mach-omap2/pm34xx.c
arch/arm/mach-omap2/serial.c
arch/arm/mach-omap2/sr_device.c
arch/arm/mach-omap2/voltagedomains44xx_data.c
drivers/staging/tidspbridge/include/dspbridge/host_os.h
drivers/usb/musb/musb_dsps.c