android_kernel_xiaomi_sm8350/net/core
David S. Miller 65b53e4cc9 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:

	drivers/net/tg3.c
	drivers/net/wireless/rt2x00/rt2x00dev.c
	net/mac80211/ieee80211_i.h
2008-06-10 02:22:26 -07:00
..
datagram.c
dev_mcast.c
dev.c net: Fix call to ->change_rx_flags(dev, IFF_MULTICAST) in dev_change_flags() 2008-05-20 14:36:14 -07:00
dst.c [NET]: uninline dst_release 2008-03-27 17:53:31 -07:00
ethtool.c ethtool: EEPROM dump no longer works for tg3 and natsemi 2008-04-24 20:55:56 -07:00
fib_rules.c [NETNS]: Add netns refcnt debug to fib rules. 2008-04-16 02:01:56 -07:00
filter.c net: use get/put_unaligned_* helpers 2008-05-02 16:26:16 -07:00
flow.c net: Remove unnecessary inclusions of asm/semaphore.h 2008-04-18 22:15:50 -04:00
gen_estimator.c
gen_stats.c
iovec.c
kmap_skb.h
link_watch.c
Makefile
neighbour.c netlink: Improve returned error codes 2008-06-03 16:36:54 -07:00
net_namespace.c [NETNS]: Make netns refconting debug like a socket one. 2008-04-16 01:58:04 -07:00
net-sysfs.c net: The dev->get_stats pointer is not NULL nowadays. 2008-05-21 14:12:46 -07:00
net-sysfs.h netns: Fix device renaming for sysfs 2008-05-02 17:00:58 -07:00
netevent.c
netpoll.c net: Allow netdevices to specify needed head/tailroom 2008-05-12 20:48:31 -07:00
pktgen.c pktgen: make sure that pktgen_thread_worker has been executed 2008-05-20 15:12:44 -07:00
request_sock.c
rtnetlink.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2008-06-10 02:22:26 -07:00
scm.c
skbuff.c tcp: Fix for race due to temporary drop of the socket lock in skb_splice_bits. 2008-06-04 15:45:58 -07:00
sock.c net: Fix typo in net/core/sock.c. 2008-05-14 03:50:03 -07:00
stream.c
sysctl_net_core.c netns: Register net/core/ sysctls at read-only root. 2008-05-19 13:49:52 -07:00
user_dma.c net_dma: remove duplicate assignment in dma_skb_copy_datagram_iovec 2008-06-03 16:07:45 -07:00
utils.c