linux/drivers/parport
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
..
BUGS-parport
Kconfig Fix common misspellings 2011-03-31 11:26:23 -03:00
Makefile [PATCH] AX88796 parallel port driver 2006-06-25 10:01:09 -07:00
TODO-parport
daisy.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
ieee1284.c Fix common misspellings 2011-03-31 11:26:23 -03:00
ieee1284_ops.c parport: fix ieee1284_epp_read_addr 2008-02-08 09:22:36 -08:00
multiface.h
parport_amiga.c m68k: amiga - Parallel port platform device conversion 2010-05-26 19:51:09 +02:00
parport_atari.c m68k: atari - Rename "mfp" to "st_mfp" 2009-02-22 09:23:02 -08:00
parport_ax88796.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
parport_cs.c pcmcia: remove obsolete and wrong comments 2010-09-29 17:20:25 +02:00
parport_gsc.c parport: remove driver_data direct access of struct device 2009-06-15 21:30:28 -07:00
parport_gsc.h remove the bouncing email address of David Campbell 2006-06-26 18:19:23 +02:00
parport_ip32.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
parport_mfc3.c m68k: parport_mfc3 - Not makes it a bool before the comparison. 2009-12-06 11:18:28 +01:00
parport_pc.c 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
parport_serial.c parport_serial: use the PCI IRQ if offered 2010-08-11 08:59:22 -07:00
parport_sunbpp.c dt/sparc: Eliminate users of of_platform_{,un}register_driver 2011-02-28 01:36:39 -07:00
probe.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
procfs.c sysctl: Drop & in front of every proc_handler. 2009-11-18 08:37:40 -08:00
share.c parport: make lockdep happy with waitlist_lock 2011-01-26 10:49:59 +10:00