| author | Dan Murphy <DMurphy@ti.com> | |
| Mon, 27 Oct 2014 12:33:32 +0000 (07:33 -0500) | ||
| committer | Dan Murphy <DMurphy@ti.com> | |
| Mon, 27 Oct 2014 12:33:32 +0000 (07:33 -0500) | ||
| commit | a7a814b810b02b80938f1c466af83891e3038258 | |
| tree | c2c791ea118a5247d19d0719f9c9b15b14d1528c | tree | snapshot (tar.xz tar.gz zip) |
| parent | 9fc9562ad5f03d47bbd23a91e8b3e8db2e1ad946 | commit | diff |
| parent | da05cdad16cb704f207cde1ae899319d9eb806ff | 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: musb: dsps: fix the base address for accessing the mode register
ARM: dts: am335x-evmsk: enable second USB controller
mm: dmapool: add/remove sysfs file outside of the pool lock lock
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: musb: dsps: fix the base address for accessing the mode register
ARM: dts: am335x-evmsk: enable second USB controller
mm: dmapool: add/remove sysfs file outside of the pool lock lock
Signed-off-by: Dan Murphy <DMurphy@ti.com>
| arch/arm/boot/dts/am335x-evmsk.dts | diff1 | | diff2 | | blob | history |
| drivers/usb/musb/musb_dsps.c | diff1 | | diff2 | | blob | history |