linux/drivers/tty
Linus Torvalds c511dc1fb6 Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
Pull slave-dmaengine update from Vinod Koul:
 "This time we have a new dmaengine driver from the tegra folks.  Also
  we have Guennadi's cleanup of sh drivers which incudes a library for
  sh drivers.  And the usual odd fixes in bunch of drivers and some nice
  cleanup of dw_dmac from Andy."

Fix up conflicts in drivers/mmc/host/sh_mmcif.c

* 'next' of git://git.infradead.org/users/vkoul/slave-dma: (46 commits)
  dmaengine: Cleanup logging messages
  mmc: sh_mmcif: switch to the new DMA channel allocation and configuration
  dma: sh: provide a migration path for slave drivers to stop using .private
  dma: sh: use an integer slave ID to improve API compatibility
  dmaengine: shdma: prepare to stop using struct dma_chan::private
  sh: remove unused DMA device pointer from SIU platform data
  ASoC: siu: don't use DMA device for channel filtering
  dmaengine: shdma: (cosmetic) simplify a static function
  dmaengine: at_hdmac: add a few const qualifiers
  dw_dmac: use 'u32' for LLI structure members, not dma_addr_t
  dw_dmac: mark dwc_dump_lli inline
  dma: mxs-dma: Export missing symbols from mxs-dma.c
  dma: shdma: convert to the shdma base library
  ASoC: fsi: prepare for conversion to the shdma base library
  usb: renesas_usbhs: prepare for conversion to the shdma base library
  ASoC: siu: prepare for conversion to the shdma base library
  serial: sh-sci: prepare for conversion to the shdma base library
  mmc: sh_mobile_sdhi: prepare for conversion to the shdma base library
  mmc: sh_mmcif: remove unneeded struct sh_mmcif_dma, prepare to shdma conversion
  dma: shdma: prepare for conversion to the shdma base library
  ...
2012-07-24 17:12:54 -07:00
..
hvc Features: 2012-07-24 13:14:03 -07:00
ipwireless
serial Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma 2012-07-24 17:12:54 -07:00
vt Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2012-05-23 11:16:40 -07:00
Kconfig
Makefile
amiserial.c tty: Revert the tty locking series, it needs more work 2012-06-02 15:21:43 -07:00
bfin_jtag_comm.c
cyclades.c tty: Revert the tty locking series, it needs more work 2012-06-02 15:21:43 -07:00
ehv_bytechan.c
isicom.c
moxa.c
moxa.h
mxser.c
mxser.h
n_gsm.c
n_hdlc.c
n_r3964.c tty: Revert the tty locking series, it needs more work 2012-06-02 15:21:43 -07:00
n_tracerouter.c
n_tracesink.c
n_tracesink.h
n_tty.c
nozomi.c
pty.c tty: Revert the tty locking series, it needs more work 2012-06-02 15:21:43 -07:00
rocket.c
rocket.h
rocket_int.h
synclink.c tty: Revert the tty locking series, it needs more work 2012-06-02 15:21:43 -07:00
synclink_gt.c tty: Revert the tty locking series, it needs more work 2012-06-02 15:21:43 -07:00
synclinkmp.c tty: Revert the tty locking series, it needs more work 2012-06-02 15:21:43 -07:00
sysrq.c
tty_audit.c
tty_buffer.c
tty_io.c tty: Revert the tty locking series, it needs more work 2012-06-02 15:21:43 -07:00
tty_ioctl.c
tty_ldisc.c tty: Revert the tty locking series, it needs more work 2012-06-02 15:21:43 -07:00
tty_mutex.c tty: Revert the tty locking series, it needs more work 2012-06-02 15:21:43 -07:00
tty_port.c tty: Revert the tty locking series, it needs more work 2012-06-02 15:21:43 -07:00