Greg Kroah-Hartman
69c1f05379
Merge 3.15-rc6 into staging-next.
...
This resolves the conflicts in the files:
drivers/iio/adc/Kconfig
drivers/staging/rtl8723au/os_dep/usb_ops_linux.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-22 23:27:17 +09:00
..
hvc
drivers/tty/hvc: don't free hvc_console_setup after init
2014-05-03 18:14:28 -04:00
ipwireless
tty: Fix low_latency BUG
2014-02-28 16:31:00 -08:00
serial
tty: serial: 8250_core.c Bug fix for Exar chips.
2014-05-03 18:13:05 -04:00
vt
vt: detect and ignore OSC codes.
2014-02-28 16:25:47 -08:00
amiserial.c
tty/amiserial: avoid interruptible_sleep_on
2014-01-07 17:05:21 -08:00
bfin_jtag_comm.c
cyclades.c
ehv_bytechan.c
goldfish.c
goldfish: clean up the checkpatch warnings
2014-05-15 13:20:42 -07:00
isicom.c
Kconfig
drivers/tty: ehv_bytechan fails to build as a module
2014-01-09 17:52:12 -06:00
Makefile
metag_da.c
moxa.c
moxa.h
mxser.c
mxser.h
n_gsm.c
tty: n_gsm: Fix for modems with brk in modem status control
2014-02-07 08:40:54 -08:00
n_hdlc.c
n_r3964.c
n_tracerouter.c
n_tracesink.c
n_tracesink.h
n_tty.c
n_tty: Fix n_tty_write crash when echoing in raw mode
2014-05-03 18:13:05 -04:00
nozomi.c
pty.c
rocket.c
rocket.h
rocket_int.h
synclink.c
synclink: fix info leak in ioctl
2014-03-17 16:13:23 -07:00
synclink_gt.c
tty: synclink: avoid sleep_on race
2014-01-07 17:05:21 -08:00
synclinkmp.c
synclink: fix info leak in ioctl
2014-03-17 16:13:23 -07:00
sysrq.c
tty_audit.c
audit: anchor all pid references in the initial pid namespace
2014-03-20 10:11:55 -04:00
tty_buffer.c
tty: Fix lockless tty buffer race
2014-05-03 18:14:28 -04:00
tty_io.c
tty: fix memleak in alloc_pid
2014-04-16 14:31:13 -07:00
tty_ioctl.c
tty_ldisc.c
tty: delete non-required instances of include <linux/init.h>
2014-01-07 17:05:21 -08:00
tty_ldsem.c
lockdep: Make held_lock->check and "int check" argument bool
2014-02-09 21:18:54 +01:00
tty_mutex.c
tty_port.c
tty: delete non-required instances of include <linux/init.h>
2014-01-07 17:05:21 -08:00