David S. Miller 26440c835f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/usb/asix_common.c net/ipv4/inet_connection_sock.c net/switchdev/switchdev.c In the inet_connection_sock.c case the request socket hashing scheme is completely different in net-next. The other two conflicts were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-10-20 06:08:27 -07:00
..
hvc	s390/iucv: do not use arrays as argument	2015-09-21 16:03:04 -07:00
ipwireless
serial	serial: 8250: add uart_config entry for PORT_RT2880	2015-10-04 19:16:12 +01:00
vt
amiserial.c
bfin_jtag_comm.c
cyclades.c
ehv_bytechan.c
goldfish.c
isicom.c
Kconfig
Makefile
metag_da.c
mips_ejtag_fdc.c	MIPS: Remove "weak" from get_c0_fdc_int() declaration	2015-09-03 12:07:38 +02:00
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	tty: fix stall caused by missing memory barrier in drivers/tty/n_tty.c	2015-10-04 19:03:40 +01:00
nozomi.c
pty.c
rocket.c
rocket.h
rocket_int.h
synclink.c
synclink_gt.c
synclinkmp.c
sysrq.c	mm, oom: pass an oom order of -1 when triggered by sysrq	2015-09-08 15:35:28 -07:00
tty_audit.c
tty_buffer.c	tty: fix data race on tty_buffer.commit	2015-10-04 19:03:40 +01:00
tty_io.c	drivers/tty: require read access for controlling terminal	2015-10-04 19:20:30 +01:00
tty_ioctl.c
tty_ldisc.c
tty_ldsem.c
tty_mutex.c
tty_port.c