author | Dan Murphy <DMurphy@ti.com> | |
Sat, 30 May 2015 19:55:07 +0000 (14:55 -0500) | ||
committer | Dan Murphy <DMurphy@ti.com> | |
Sat, 30 May 2015 19:55:07 +0000 (14:55 -0500) |
TI-Feature: connectivity
TI-Tree: git://git.ti.com/connectivity-integration-tree/connectivity-ti-linux-kernel.git
TI-Branch: connectivity-ti-linux-3.14.y
* 'connectivity-ti-linux-3.14.y' of git://git.ti.com/connectivity-integration-tree/connectivity-ti-linux-kernel:
usb: dwc3: core: don't break during suspend/resume while we're dual-role
usb: dwc3: core: Prevent otg events from disabling themselves
Signed-off-by: Dan Murphy <DMurphy@ti.com>
TI-Tree: git://git.ti.com/connectivity-integration-tree/connectivity-ti-linux-kernel.git
TI-Branch: connectivity-ti-linux-3.14.y
* 'connectivity-ti-linux-3.14.y' of git://git.ti.com/connectivity-integration-tree/connectivity-ti-linux-kernel:
usb: dwc3: core: don't break during suspend/resume while we're dual-role
usb: dwc3: core: Prevent otg events from disabling themselves
Signed-off-by: Dan Murphy <DMurphy@ti.com>
Trivial merge