David S. Miller e40051d134 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/qlcnic/qlcnic_init.c net/ipv4/ip_output.c		2010-09-27 01:03:03 -07:00
..
9p	net: return operator cleanup	2010-09-23 14:33:39 -07:00
802	net: return operator cleanup	2010-09-23 14:33:39 -07:00
8021q	net: return operator cleanup	2010-09-23 14:33:39 -07:00
appletalk
atm	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-09-27 01:03:03 -07:00
ax25	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-09-09 22:27:33 -07:00
bluetooth	net: return operator cleanup	2010-09-23 14:33:39 -07:00
bridge	bridge : Sanitize skb before it enters the IP stack	2010-09-19 12:42:34 -07:00
caif	caif: Use default send and receive buffer size in caif_socket.	2010-09-21 18:05:31 -07:00
can	net: simplify flags for tx timestamping	2010-08-19 00:08:30 -07:00
core	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-09-27 01:03:03 -07:00
dcb
dccp	net: return operator cleanup	2010-09-23 14:33:39 -07:00
decnet	net/decnet: Adjust confusing if indentation	2010-08-16 21:06:30 -07:00
dns_resolver	DNS: If the DNS server returns an error, allow that to be cached [ver #2]	2010-08-11 17:11:28 +00:00
dsa	phylib: available for any speed ethernet	2010-08-11 23:03:50 -07:00
econet	net: return operator cleanup	2010-09-23 14:33:39 -07:00
ethernet	net: return operator cleanup	2010-09-23 14:33:39 -07:00
ieee802154
ipv4	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-09-27 01:03:03 -07:00
ipv6	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-09-27 01:03:03 -07:00
ipx
irda	net: return operator cleanup	2010-09-23 14:33:39 -07:00
iucv
key	net: return operator cleanup	2010-09-23 14:33:39 -07:00
l2tp	net: constify some ppp/pptp structs	2010-09-21 18:04:47 -07:00
lapb
llc	net/llc: storing negative error codes in unsigned short	2010-09-16 22:38:23 -07:00
mac80211	net: return operator cleanup	2010-09-23 14:33:39 -07:00
netfilter	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-09-27 01:03:03 -07:00
netlabel
netlink	netlink: Make NETLINK_USERSOCK work again.	2010-08-31 09:51:37 -07:00
netrom
packet	net: simplify flags for tx timestamping	2010-08-19 00:08:30 -07:00
phonet	phonet: Fix build warning.	2010-09-15 21:34:41 -07:00
rds	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-09-27 01:03:03 -07:00
rfkill	net: return operator cleanup	2010-09-23 14:33:39 -07:00
rose	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-09-27 01:03:03 -07:00
rxrpc	Add a dummy printk function for the maintenance of unused printks	2010-08-12 09:51:35 -07:00
sched	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-09-27 01:03:03 -07:00
sctp	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-09-27 01:03:03 -07:00
sunrpc	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-09-27 01:03:03 -07:00
tipc	net: return operator cleanup	2010-09-23 14:33:39 -07:00
unix	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-09-09 22:27:33 -07:00
wanrouter	net: autoconvert trivial BKL users to private mutex	2010-07-12 20:21:47 -07:00
wimax
wireless	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-09-27 01:03:03 -07:00
x25	X.25 remove bkl in poll	2010-09-22 13:35:51 -07:00
xfrm	xfrm: Allow different selector family in temporary state	2010-09-20 11:11:38 -07:00
compat.c
Kconfig	net: RPS needs to depend upon USE_GENERIC_SMP_HELPERS	2010-09-14 21:42:22 -07:00
Makefile	DNS: Separate out CIFS DNS Resolver code	2010-08-05 17:17:51 +00:00
nonet.c
socket.c	net: remove address space warnings in net/socket.c	2010-09-08 13:46:13 -07:00
sysctl_net.c
TUNABLE