WSL2-Linux-Kernel/drivers/misc
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
..
c2port Fix common misspellings 2011-03-31 11:26:23 -03:00
carma misc: Add CARMA DATA-FPGA Programmer support 2011-05-19 16:55:10 +10:00
cb710
eeprom
ibmasm Merge branch 'master' into for-next 2011-04-26 10:22:59 +02:00
iwmc3200top Fix common misspellings 2011-03-31 11:26:23 -03:00
lis3lv02d
sgi-gru sanitize <linux/prefetch.h> usage 2011-05-20 12:50:29 -07:00
sgi-xp
ti-st 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
Kconfig 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
Makefile 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
ab8500-pwm.c
ad525x_dpot-i2c.c
ad525x_dpot-spi.c
ad525x_dpot.c
ad525x_dpot.h
apds990x.c
apds9802als.c
arm-charlcd.c
atmel-ssc.c
atmel_pwm.c
atmel_tclib.c
bh1770glc.c
bh1780gli.c treewide: cleanup continuations and remove logging message whitespace 2011-04-26 10:24:37 +02:00
bmp085.c Fix common misspellings 2011-03-31 11:26:23 -03:00
cs5535-mfgpt.c cs5535: Fix section mismatch 2011-04-10 17:01:03 +02:00
ds1682.c
enclosure.c
ep93xx_pwm.c
hmc6352.c
hpilo.c
hpilo.h
ics932s401.c
ioc4.c
isl29003.c
isl29020.c
kgdbts.c Fix common misspellings 2011-03-31 11:26:23 -03:00
lkdtm.c
pch_phub.c pch_phub: Support new device ML7223 2011-05-12 09:47:42 -07:00
phantom.c
pti.c Intel PTI implementaiton of MIPI 1149.7. 2011-05-13 16:31:00 -07:00
spear13xx_pcie_gadget.c treewide: cleanup continuations and remove logging message whitespace 2011-04-26 10:24:37 +02:00
ti_dac7512.c
tifm_7xx1.c
tifm_core.c
tsl2550.c
vmw_balloon.c