linux/drivers/staging
Linus Torvalds efb8d21b2c Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
* 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (79 commits)
  TTY: serial_core: Fix crash if DCD drop during suspend
  tty/serial: atmel_serial: bootconsole removed from auto-enumerates
  Revert "TTY: call tty_driver_lookup_tty unconditionally"
  tty/serial: atmel_serial: add device tree support
  tty/serial: atmel_serial: auto-enumerate ports
  tty/serial: atmel_serial: whitespace and braces modifications
  tty/serial: atmel_serial: change platform_data variable name
  tty/serial: RS485 bindings for device tree
  TTY: call tty_driver_lookup_tty unconditionally
  TTY: pty, release tty in all ptmx_open fail paths
  TTY: make tty_add_file non-failing
  TTY: drop driver reference in tty_open fail path
  8250_pci: Fix kernel panic when pch_uart is disabled
  h8300: drivers/serial/Kconfig was moved
  parport_pc: release IO region properly if unsupported ITE887x card is found
  tty: Support compat_ioctl get/set termios_locked
  hvc_console: display printk messages on console.
  TTY: snyclinkmp: forever loop in tx_load_dma_buffer()
  tty/n_gsm: avoid fifo overflow in gsm_dlci_data_output
  tty/n_gsm: fix a bug in gsm_dlci_data_output (adaption = 2 case)
  ...

Fix up Conflicts in:
 - drivers/tty/serial/8250_pci.c
	Trivial conflict with removed duplicate device ID
 - drivers/tty/serial/atmel_serial.c
	Annoying silly conflict between "specify the port num via
	platform_data" and other changes to atmel_console_init
2011-10-26 15:11:09 +02:00
..
altera-stapl
asus_oled
bcm Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-07-25 23:26:34 -07:00
brcm80211 Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into for-davem 2011-10-11 15:35:42 -04:00
comedi staging: fix comedi build when ISA_DMA_API is enabled but COMEDI_PCI is not enabled 2011-09-19 17:15:46 -07:00
cptm1217
crystalhd
cx25821
cxd2099 Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 2011-07-30 00:08:53 -07:00
cxt1e1 doc: fix broken references 2011-09-27 18:08:04 +02:00
dt3155v4l drivers/staging/dt3155v4l/dt3155v4l.c needs slab.h 2011-08-02 16:09:47 -07:00
easycap
echo
et131x net: use DMA_x_DEVICE and dma_mapping_error with skb_frag_dma_map 2011-10-06 16:17:20 -04:00
frontier
ft1000 staging: ft1000_proc needs asm/io.h for inw/outw on sparc 2011-08-02 16:07:51 -07:00
gma500 gma500: kill MIPI interface types 2011-08-16 07:22:16 -07:00
go7007
hv net: add skb frag size accessors 2011-10-19 03:10:46 -04:00
iio Merge branch 'master' into for-next 2011-09-15 15:08:18 +02:00
intel_sst
keucr Staging: Remove ENE UB6250 MS card codes from keucr 2011-07-08 14:12:52 -07:00
line6
lirc Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-07-25 23:26:34 -07:00
mei
nvec Staging: Add clk API note to nvec/TODO 2011-08-02 16:12:49 -07:00
octeon Merge branch 'master' of ra.kernel.org:/pub/scm/linux/kernel/git/davem/net 2011-10-24 18:18:09 -04:00
olpc_dcon
panel
phison
pohmelfs Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 2011-07-22 19:02:39 -07:00
quatech_usb2
quickstart
rtl8187se net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
rtl8192e net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
rtl8192u Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net 2011-08-20 10:39:12 -07:00
rtl8712 Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-07-25 23:26:34 -07:00
rts_pstor staging:rts_pstor: fix thread synchronization flow 2011-08-08 12:05:34 -07:00
sbe-2t3e3
sep Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-07-25 23:26:34 -07:00
serial TTY: serial, move 68360 driver to staging 2011-09-22 16:00:20 -07:00
serqt_usb2
slicoss net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
sm7xx
solo6x10 drivers:staging:solo6x10:add the missed slab.h 2011-08-03 07:44:38 -07:00
speakup drivers/staging/speakup/devsynth.c: fix "buffer size is not provably correct" error 2011-08-02 16:09:46 -07:00
spectra spectra: enable device before poking it 2011-07-18 13:22:53 -07:00
ste_rmi4
tidspbridge staging: tidspbridge: fix compilation on dsp clock functions 2011-08-24 14:35:26 -07:00
tm6000 Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 2011-07-30 00:08:53 -07:00
usbip
vme
vt6655 net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
vt6656 net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
winbond mac80211: add ieee80211_vif param to tsf functions 2011-09-27 14:27:48 -04:00
wlags49_h2 net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
wlags49_h25
wlan-ng net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
xgifb
zcache staging: zcache: fix cleancache crash 2011-09-20 14:17:13 -07:00
zram Staging: zram: Fix kunmapping order 2011-07-18 13:22:52 -07:00
Kconfig Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty 2011-10-26 15:11:09 +02:00
Makefile Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty 2011-10-26 15:11:09 +02:00
staging.c