| 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) |
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-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>
| 1 | 2 | |||
|---|---|---|---|---|
| arch/arm/boot/dts/am57xx-beagle-x15.dts | patch | | diff1 | | diff2 | | blob | history |
| include/linux/mfd/palmas.h | patch | | diff1 | | diff2 | | blob | history |
diff --cc arch/arm/boot/dts/am57xx-beagle-x15.dts
Simple merge
diff --cc include/linux/mfd/palmas.h
Simple merge