Greg Kroah-Hartman c87985a3ce Merge tty-next into 3.6-rc1 ... This handles the merge issue in: arch/um/drivers/line.c arch/um/drivers/line.h And resolves the duplicate patches that were in both trees do to the tty-next branch not getting merged into 3.6-rc1. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2012-08-06 09:48:31 -07:00
..
appletalk	drivers: net: Remove casts to same type	2012-06-06 09:31:33 -07:00
arcnet
bonding	bond_sysfs: use real_num_tx_queues rather than params.tx_queue	2012-07-20 11:07:00 -07:00
caif	caif: fix NULL pointer check	2012-07-24 13:54:16 -07:00
can	net/c_can: remove conditional compilation of clk code	2012-07-30 17:25:12 -07:00
cris	net: Properly define functions with no parameters	2012-07-10 23:13:45 -07:00
dsa
ethernet	Merge tty-next into 3.6-rc1	2012-08-06 09:48:31 -07:00
fddi	drivers: net: Remove casts to same type	2012-06-06 09:31:33 -07:00
hamradio	drivers: net: Remove casts to same type	2012-06-06 09:31:33 -07:00
hippi
hyperv	hyperv: Add error handling to rndis_filter_device_add()	2012-07-25 15:31:30 -07:00
irda	Merge tty-next into 3.6-rc1	2012-08-06 09:48:31 -07:00
phy	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	2012-07-30 11:45:52 -07:00
plip
ppp	ppp: avoid false drop_monitor false positives	2012-05-19 02:32:30 -04:00
slip	drivers: net: Remove casts to same type	2012-06-06 09:31:33 -07:00
team	team: init error value to 0 in team_netpoll_setup()	2012-07-24 13:54:15 -07:00
usb	Merge tty-next into 3.6-rc1	2012-08-06 09:48:31 -07:00
vmxnet3	drivers: net: Remove casts to same type	2012-06-06 09:31:33 -07:00
wan	drivers: net: Remove casts to same type	2012-06-06 09:31:33 -07:00
wimax	wimax: fix printk format warnings	2012-07-22 12:18:39 -07:00
wireless	Merge branch 'for-linus-3.6' of git://dev.laptop.org/users/dilinger/linux-olpc	2012-08-02 11:52:39 -07:00
xen-netback	xen/netback: only non-freed SKB is queued into tx_queue	2012-06-29 00:50:20 -07:00
dummy.c	net: fix race condition in several drivers when reading stats	2012-07-22 12:12:32 -07:00
eql.c
ifb.c
Kconfig	tokenring: delete all remaining driver support	2012-05-15 20:23:16 -04:00
LICENSE.SRC
loopback.c	net: fix race condition in several drivers when reading stats	2012-07-22 12:12:32 -07:00
macvlan.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-05-16 22:17:37 -04:00
macvtap.c	macvtap: use prepare_to_wait/finish_wait to ensure mb	2012-06-07 13:18:54 -07:00
Makefile	tokenring: delete all remaining driver support	2012-05-15 20:23:16 -04:00
mdio.c
mii.c
netconsole.c
rionet.c
sb1000.c
Space.c	drivers/net: delete all code/drivers depending on CONFIG_MCA	2012-05-17 16:37:41 -04:00
sungem_phy.c
tun.c	tun: Fix formatting.	2012-07-30 14:52:48 -07:00
veth.c
virtio_net.c	net: fix race condition in several drivers when reading stats	2012-07-22 12:12:32 -07:00
xen-netfront.c	xen/netfront: teardown the device before unregistering it.	2012-06-27 01:25:41 -07:00