David S. Miller b26d344c6b Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/caif/caif_hsi.c drivers/net/usb/qmi_wwan.c The qmi_wwan merge was trivial. The caif_hsi.c, on the other hand, was not. It's a conflict between 1c385f1fdf ("caif-hsi: Replace platform device with ops structure.") in the net-next tree and commit 39abbaef19 ("caif-hsi: Postpone init of HIS until open()") in the net tree. I did my best with that one and will ask Sjur to check it out. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-06-28 17:37:00 -07:00
..
client.c	net/9p: Add __force to cast of __user pointer	2012-06-04 13:51:17 -04:00
error.c	9p: Reduce object size with CONFIG_NET_9P_DEBUG	2012-01-05 10:51:44 -06:00
Kconfig	9p: remove experimental tag from tested configurations	2011-05-25 08:46:38 -05:00
Makefile	[net/9p] Preparation and helper functions for zero copy	2011-03-15 09:57:34 -05:00
mod.c	9p: Reduce object size with CONFIG_NET_9P_DEBUG	2012-01-05 10:51:44 -06:00
protocol.c	9p: fix min_t() casting in p9pdu_vwritef()	2012-06-27 15:26:24 -07:00
protocol.h	net/9p: Convert net/9p protocol dumps to tracepoints	2011-10-24 11:13:12 -05:00
trans_common.c	fs/9p: Update zero-copy implementation in 9p	2011-10-24 11:13:11 -05:00
trans_common.h	fs/9p: Update zero-copy implementation in 9p	2011-10-24 11:13:11 -05:00
trans_fd.c	net: cleanup unsigned to unsigned int	2012-04-15 12:44:40 -04:00
trans_rdma.c	9p: Reduce object size with CONFIG_NET_9P_DEBUG	2012-01-05 10:51:44 -06:00
trans_virtio.c	9p: BUG before corrupting memory	2012-06-11 10:29:07 -05:00
util.c	9p: Reduce object size with CONFIG_NET_9P_DEBUG	2012-01-05 10:51:44 -06:00