| author | Dan Murphy <DMurphy@ti.com> | |
| Mon, 18 May 2015 14:56:53 +0000 (09:56 -0500) | ||
| committer | Dan Murphy <DMurphy@ti.com> | |
| Mon, 18 May 2015 14:56:53 +0000 (09:56 -0500) | ||
| commit | b128c70b1998b0fd5f4e39cc1edd6808a2a7f692 | |
| tree | 063abe1a4d974bb065404146f8d2843bcdca1857 | tree | snapshot (tar.xz tar.gz zip) |
| parent | 7178681a5b4d9f5ac769a1d4eeb2740a36803507 | commit | diff |
| parent | 4b3207c3fdcd0903896b2ffb75be83ca92bbf3b3 | 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:
ARM: dts: am57xx-beagle-x15: use palmas-usb for USB2
extcon: palmas: Support GPIO based USB ID detection
usb: gadget: use $(srctree) instead of $(PWD) for includes
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:
ARM: dts: am57xx-beagle-x15: use palmas-usb for USB2
extcon: palmas: Support GPIO based USB ID detection
usb: gadget: use $(srctree) instead of $(PWD) for includes
Signed-off-by: Dan Murphy <DMurphy@ti.com>
| arch/arm/boot/dts/am57xx-beagle-x15.dts | diff1 | | diff2 | | blob | history |
| include/linux/mfd/palmas.h | diff1 | | diff2 | | blob | history |