Edison/Targa: defconfig: add missing options
omap: opp: introduce new omap_opp_enable function [3.0.31], raise voltages, change IVA setup
cpu: add Nightmare governor to Makefile
Targa: Fix typo (fixes bootloop)
omap: opp: cleanup and enable IVA OPP4 to prevent crashes on HDMI sound
omap4-common: Revert back to Motorola's workaround for i719

Revert "Revert "[moto] arch/arm/mach-omap2/omap4-sar: changes for sar restore""
This reverts commit fed5f03d61d40147bbd0a8a6f4efa2f13ae74d2d.

Revert "ARM: OMAP4: USB: Update workaround for USB errata i719"
This reverts commit 58cb9633db740df1268c28426de62d025ebb0ed9.

Revert "OMAP4430: USB Host: Implement workaround for Errata i719"
This reverts commit 4f22585d474427eec131fbf9740ddcaf6c8de0d8.

Revert "OMAP4: SAR: WA overwrite L3INIT CD mode to SW_SLEEP(1) in SAR"
This reverts commit 49af0431b126f0e71f7539212c17a8c35fd810cf.

Change-Id: I83d1a2b212b8138f34c782ef926ec2250dfc585b

Conflicts:
	arch/arm/mach-omap2/omap4-sar.c
	arch/arm/mach-omap2/pm44xx.c
	arch/arm/plat-omap/include/plat/usb.h
omap: sound: remove OPP_PATCH to prevent conflicts with HDMI sound
omap: cpu: update cpuidle driver and fix syntax for pm
i2c: update all drivers
omap: board: usb: cleanup
thermal_framework: update header file [3.0.31]
serial: mdm6600: update driver [3.0.31]
gpio: update pca952x driver (not related to this device)
include: hcd: update [3.0.31]
thermal_framework: add missing struct *domain
Revert "thermal_framework: add missing struct *domain"

This reverts commit 54b38da1fde9ac145c57e121422798f321d80e04.
Revert "thermal_framework: update header file [3.0.31]"

This reverts commit 197cae04176cf9b0a260040be1a5c2294fc87c4c.
omap: cpufreq: fix thermal framework cooling init
Revert "omap: thermal: fix header"

This reverts commit 04f9744b031f941a1bfff09957f8c3433b23712c.
omap: thermal: fix header