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
..
datagram.c	net: skb_free_datagram_locked() doesnt drop all packets	2012-06-27 15:40:57 -07:00
dev.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-06-28 17:37:00 -07:00
dev_addr_lists.c
drop_monitor.c	drop_monitor: dont sleep in atomic context	2012-06-04 11:42:01 -04:00
dst.c
ethtool.c	ethtool: Make more commands available to unprivileged processes	2012-06-12 18:51:09 -07:00
fib_rules.c
filter.c	net/core: fix kernel-doc warnings	2012-06-08 22:20:58 -07:00
flow.c
flow_dissector.c
gen_estimator.c
gen_stats.c
iovec.c
link_watch.c
Makefile
neighbour.c	net: neighbour: fix neigh_dump_info()	2012-06-07 13:02:21 -07:00
net-sysfs.c	wireless: remove wext sysfs	2012-06-05 15:32:15 -04:00
net-sysfs.h
net-traces.c
net_namespace.c	net: core: Use pr_<level>	2012-05-17 05:00:04 -04:00
netevent.c
netpoll.c	netpoll: fix netpoll_send_udp() bugs	2012-06-13 15:57:31 -07:00
netprio_cgroup.c	Merge branch 'for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup	2012-05-22 17:40:19 -07:00
pktgen.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-05-20 21:53:04 -04:00
request_sock.c
rtnetlink.c	netlink: Get rid of obsolete rtnetlink macros	2012-06-27 15:36:44 -07:00
scm.c
secure_seq.c
skbuff.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-06-12 21:59:18 -07:00
sock.c	ipv4: Early TCP socket demux.	2012-06-19 21:22:05 -07:00
sock_diag.c	sock_diag: Do not use RTA_PUT() macros	2012-06-27 15:36:43 -07:00
stream.c
sysctl_net_core.c
timestamping.c
user_dma.c
utils.c