Merge branch 'p-ti-linux-3.14.y-common' into p-ti-linux-3.14.y-android
authorVishal Mahaveer <vishalm@ti.com>
Thu, 17 Sep 2015 12:10:55 +0000 (07:10 -0500)
committerVishal Mahaveer <vishalm@ti.com>
Thu, 17 Sep 2015 12:10:55 +0000 (07:10 -0500)
commitbe2a91aed38178a77786b7e8359c14bdb03d2af7
treefefc9a50dd1493e38dde239af6966bbcec596045
parent257a0dce34ee508158f916a3aab015b3649dba5a
parentd803e0eaf16383da57a734ee4fa071290bad5685
Merge branch 'p-ti-linux-3.14.y-common' into p-ti-linux-3.14.y-android

* p-ti-linux-3.14.y-common:
  dmaengine: omap-dma: Support for polled memcpy transfers
  hack: increase tty buffer size and complain if tty buffer full
  dma: omap-dma: don't return an error if pause failed due to completion
  dma: omap-dma: don't return an error if pause a non-existent transfers
  serial: 8250: omap: restore registers on shutdown
  serial: 8250: move rx_running out of the bitfield
  dma: omap-dma: add support for pause of non-cyclic transfers
  dma: add __must_check annotation for dmaengine_pause()
  tty: serial: 8250_omap: do not use RX DMA if pause is not supported

Change-Id: Iecf0f9f2f72b340fad72cd2f9552995caad7371b
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>