John W. Linville 515db09338 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux ...

Conflicts:
	drivers/net/wireless/iwlegacy/iwl-debugfs.c
	drivers/net/wireless/iwlegacy/iwl-rx.c
	drivers/net/wireless/iwlegacy/iwl-scan.c
	drivers/net/wireless/iwlegacy/iwl-tx.c
	include/net/bluetooth/bluetooth.h

2011-11-22 14:05:46 -05:00

..

datagram.c

net: add skb frag size accessors

2011-10-19 03:10:46 -04:00

dev_addr_lists.c

net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules

2011-10-31 19:30:30 -04:00

dev.c

vlan: allow nested vlan_do_receive()

2011-10-30 04:43:30 -04:00

drop_monitor.c

net,rcu: convert call_rcu(free_dm_hw_stat) to kfree_rcu()

2011-05-07 22:50:59 -07:00

dst.c

net: fix potential neighbour race in dst_ifdown()

2011-08-09 21:47:14 -07:00

ethtool.c

net: consolidate and fix ethtool_ops->get_settings calling

2011-09-15 17:32:26 -04:00

fib_rules.c

net: Fix files explicitly needing to include module.h

2011-10-31 19:30:28 -04:00

filter.c

filter: use unsigned int to silence static checker warning

2011-10-19 19:35:51 -04:00

flow.c

net/flow: Fix potential memory leak

2011-10-17 19:18:42 -04:00

gen_estimator.c

net,rcu: convert call_rcu(__gen_kill_estimator) to kfree_rcu()

2011-05-07 22:50:57 -07:00

gen_stats.c

net/core: EXPORT_SYMBOL cleanups

2010-07-12 12:57:55 -07:00

iovec.c

net: Limit socket I/O iovec total length to INT_MAX.

2010-10-28 11:47:52 -07:00

kmap_skb.h

net: convert core to skb paged frag APIs

2011-08-24 17:52:11 -07:00

link_watch.c

net: linkwatch: allow vlans to get carrier changes faster

2011-09-15 15:36:34 -04:00

Makefile

net: Compute protocol sequence numbers and fragment IDs using MD5.

2011-08-06 18:33:19 -07:00

neighbour.c

neigh: Kill bogus SMP protected debugging message.

2011-11-01 17:45:55 -04:00

net_namespace.c

net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules

2011-10-31 19:30:30 -04:00

net-sysfs.c

net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules

2011-10-31 19:30:30 -04:00

net-sysfs.h

xps: Add CONFIG_XPS

2010-11-28 18:24:14 -08:00

net-traces.c

net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules

2011-10-31 19:30:30 -04:00

netevent.c

net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules

2011-10-31 19:30:30 -04:00

netpoll.c

net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules

2011-10-31 19:30:30 -04:00

pktgen.c

pktgen: remove ndelay() call

2011-10-20 17:00:21 -04:00

request_sock.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2010-12-08 13:47:38 -08:00

rtnetlink.c

if_link: Add additional parameter to IFLA_VF_INFO for spoof checking

2011-10-16 13:15:38 -07:00

scm.c

af_unix: dont send SCM_CREDENTIALS by default

2011-09-28 13:29:50 -04:00

secure_seq.c

tcp: add const qualifiers where possible

2011-10-21 05:22:42 -04:00

skbuff.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

2011-11-22 14:05:46 -05:00

sock.c

net: add wireless TX status socket option

2011-11-09 16:01:02 -05:00

stream.c

net: Fix the condition passed to sk_wait_event()

2010-10-03 20:41:32 -07:00

sysctl_net_core.c

net: Kill ratelimit.h dependency in linux/net.h

2011-05-27 13:41:33 -04:00

timestamping.c

net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules

2011-10-31 19:30:30 -04:00

user_dma.c

net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules

2011-10-31 19:30:30 -04:00

utils.c

net: Kill ratelimit.h dependency in linux/net.h

2011-05-27 13:41:33 -04:00