| 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) | ||
| commit | 6460c83b6d04c76c809bddad9c5275088e6515e5 | |
| tree | 71f0055055d2a16b1219ec76186481ef1078c240 | tree | snapshot (tar.xz tar.gz zip) |
| parent | cb923587aa582f7888122f5aaa404a1651331926 | commit | diff |
| parent | bda7692b626972cc84e753b3d9ec0c9f70e1f835 | commit | diff |
Merge branch 'connectivity-ti-linux-3.14.y' of git://git.ti.com/connectivity-integration-tree/connectivity-ti-linux-kernel into ti-linux-3.14.y
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-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>