Merge branch 'connectivity-ti-linux-3.14.y' of git://git.ti.com/connectivity-integrat...
authorDan Murphy <DMurphy@ti.com>
Thu, 4 Dec 2014 13:33:10 +0000 (07:33 -0600)
committerDan Murphy <DMurphy@ti.com>
Thu, 4 Dec 2014 13:33:10 +0000 (07:33 -0600)
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>
1  2 
arch/arm/boot/dts/dra7-evm.dts
drivers/tty/serial/omap-serial.c

Simple merge
Simple merge