Merge branch 'connectivity-ti-linux-3.14.y' of git://git.ti.com/connectivity-integrat... ti2014.10.02
authorDan Murphy <DMurphy@ti.com>
Fri, 20 Mar 2015 15:33:48 +0000 (10:33 -0500)
committerDan Murphy <DMurphy@ti.com>
Fri, 20 Mar 2015 15:33:48 +0000 (10:33 -0500)
commite53372f1d9ca5a411741ad527d54d1fa67f56f34
treee7e62855c61d99902ee327dee91c2c92f08cf1ef
parent5127b235b584ab300d510f6071464ed9ebd66e9a
parent565142cdae910b30b78418276a5ccfac04b0e70c
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: AM4372: add dma properties for uart
  ARM: dts: am437x-gp-evm: move mmc3 dma events from uart3
  tty: 8250: workaround errata around disabling UART after using DMA
  tty: 8250: omap eliminate use of of_machine_is_compatible()
  tty: 8250: omap: introduce function to update mdr1

Signed-off-by: Dan Murphy <DMurphy@ti.com>