tmp_suning_uos_patched/sound/soc
Linus Torvalds 99dff58562 Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
* 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (48 commits)
  serial: 8250_pci: add support for Cronyx Omega PCI multiserial board.
  tty/serial: Fix break handling for PORT_TEGRA
  tty/serial: Add explicit PORT_TEGRA type
  n_tracerouter and n_tracesink ldisc additions.
  Intel PTI implementaiton of MIPI 1149.7.
  Kernel documentation for the PTI feature.
  export kernel call get_task_comm().
  tty: Remove to support serial for S5P6442
  pch_phub: Support new device ML7223
  8250_pci: Add support for the Digi/IBM PCIe 2-port Adapter
  ASoC: Update cx20442 for TTY API change
  pch_uart: Support new device ML7223 IOH
  parport: Use request_muxed_region for IT87 probe and lock
  tty/serial: add support for Xilinx PS UART
  n_gsm: Use print_hex_dump_bytes
  drivers/tty/moxa.c: Put correct tty value
  TTY: tty_io, annotate locking functions
  TTY: serial_core, remove superfluous set_task_state
  TTY: serial_core, remove invalid test
  Char: moxa, fix locking in moxa_write
  ...

Fix up trivial conflicts in drivers/bluetooth/hci_ldisc.c and
drivers/tty/serial/Makefile.

I did the hci_ldisc thing as an evil merge, cleaning things up.
2011-05-23 12:23:20 -07:00
..
atmel
au1x
blackfin
codecs Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 2011-05-23 12:23:20 -07:00
davinci ASoC: davinci-mcasp: enable ping-pong SRAM buffers 2011-05-19 14:11:17 -07:00
ep93xx
fsl
imx
jz4740
kirkwood
mid-x86
nuc900
omap ASoC: omap-mcbsp: Remove restrictive checks for cpu type 2011-05-13 12:00:15 +01:00
pxa ASoC: add iPAQ hx4700 machine driver 2011-05-19 14:10:59 -07:00
s6000
samsung
sh
tegra ASoC: Tegra: Fix compile when debugfs not enabled 2011-05-20 11:20:13 +01:00
txx9
Kconfig
Makefile
soc-cache.c ASoC: Reintroduce do_spi_write() 2011-05-15 08:50:59 -07:00
soc-core.c ASoC: core: Don't set "(null)" as a driver name 2011-05-22 10:31:11 +08:00
soc-dapm.c
soc-jack.c
soc-utils.c