author | Dan Murphy <DMurphy@ti.com> | |
Thu, 4 Dec 2014 13:33:10 +0000 (07:33 -0600) | ||
committer | Dan Murphy <DMurphy@ti.com> | |
Thu, 4 Dec 2014 13:33:10 +0000 (07:33 -0600) | ||
commit | 89c7c14793fcb5d9d5790c2def4e8cc37810b792 | |
tree | 2d5f867a076b1bca5d84d3b8ad4b3c166b554cb6 | tree | snapshot (tar.xz tar.gz zip) |
parent | e2d2d86cb159cece4c074598951c1ac9e169daa2 | commit | diff |
parent | 13118ef4891e9d3f281cfc864ba390c79d9f477b | 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:
dma: cppi41: add a delay while setting the TD bit
dma: cppi41: wait longer for the HW to return the descriptor
ARM: DTS: dra7-evm: Add UART3 select gpio
tty: serial: omap: add option for external uart select
can: mark device as pm_runtime_irq_safe
drivers: net : cpsw: Update Kconfig for CPSW
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:
dma: cppi41: add a delay while setting the TD bit
dma: cppi41: wait longer for the HW to return the descriptor
ARM: DTS: dra7-evm: Add UART3 select gpio
tty: serial: omap: add option for external uart select
can: mark device as pm_runtime_irq_safe
drivers: net : cpsw: Update Kconfig for CPSW
Signed-off-by: Dan Murphy <DMurphy@ti.com>
arch/arm/boot/dts/dra7-evm.dts | diff1 | | diff2 | | blob | history |
drivers/tty/serial/omap-serial.c | diff1 | | diff2 | | blob | history |