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

…

serial

tty: serial: 8250_core.c Bug fix for Exar chips.

2014-05-03 18:13:05 -04:00

vt

…

amiserial.c

…

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

…

Makefile

…

metag_da.c

…

moxa.c

…

moxa.h

…

mxser.c

…

mxser.h

…

n_gsm.c

…

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_int.h

…

rocket.c

…

rocket.h

…

synclink_gt.c

…

synclink.c

synclink: fix info leak in ioctl

2014-03-17 16:13:23 -07: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_ldsem.c

…

tty_mutex.c

…

tty_port.c

…