John W. Linville 1fcfe76a76 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 ... Conflicts: drivers/net/wireless/iwlwifi/iwl-1000.c drivers/net/wireless/iwlwifi/iwl-6000.c drivers/net/wireless/iwlwifi/iwl-core.h		2010-12-15 16:33:28 -05:00
..
9p	net/9p: Return error on read with NULL buffer	2010-10-28 09:08:49 -05:00
802	net/802: add __rcu annotations	2010-10-25 13:09:44 -07:00
8021q	vlan: rcu annotations	2010-10-25 13:09:43 -07:00
appletalk
atm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-10-23 11:47:02 -07:00
ax25	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-10-24 13:41:39 -07:00
bluetooth	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6	2010-12-15 16:33:28 -05:00
bridge	bridge: Forward reserved group addresses if !STP	2010-10-21 04:25:48 -07:00
caif	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-10-06 19:39:31 -07:00
can	can-raw: add msg_flags to distinguish local traffic	2010-10-21 04:27:03 -07:00
ceph	ceph: fix num_pages_free accounting in pagelist	2010-10-20 15:38:23 -07:00
core	pktgen: Limit how much data we copy onto the stack.	2010-10-28 11:47:53 -07:00
dcb
dccp	dccp ccid-2: Stop polling	2010-10-28 10:27:01 -07:00
decnet	net dst: use a percpu_counter to track entries	2010-10-11 13:06:53 -07:00
dns_resolver
dsa
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	ip_gre: fix fallback tunnel setup	2010-10-30 16:21:28 -07:00
ipv6	ipv6/udp: report SndbufErrors and RcvbufErrors	2010-10-30 16:17:23 -07:00
ipx	BKL: introduce CONFIG_BKL.	2010-10-21 15:44:13 +02:00
irda	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-10-24 13:41:39 -07:00
iucv	[S390] cleanup lowcore access from external interrupts	2010-10-25 16:10:19 +02:00
key	net: return operator cleanup	2010-09-23 14:33:39 -07:00
l2tp	l2tp: static functions should not be exported	2010-10-24 22:26:41 -07:00
lapb
llc	net/llc: storing negative error codes in unsigned short	2010-09-16 22:38:23 -07:00
mac80211	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6	2010-12-15 16:33:28 -05:00
netfilter	netfilter: xt_socket: Make tproto signed in socket_mt6_v1().	2010-10-28 12:59:53 -07:00
netlabel
netlink	netlink: fix netlink_change_ngroups()	2010-10-24 16:25:39 -07:00
netrom
packet
phonet	phonet: remove the unused variable pn	2010-10-20 01:55:54 -07:00
rds	RDS: Let rds_message_alloc_sgs() return NULL	2010-10-30 16:34:18 -07:00
rfkill	rfkill: remove dead code	2010-11-15 13:24:06 -05: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
sched	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-10-23 11:47:02 -07:00
sctp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-10-23 11:47:02 -07:00
sunrpc	convert get_sb_single() users	2010-10-29 04:16:28 -04:00
tipc	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-10-21 08:43:05 -07:00
unix	fs: allow for more than 2^31 files	2010-10-26 16:52:15 -07:00
wanrouter
wimax
wireless	cfg80211/nl80211: separate unicast/multicast default TX keys	2010-12-13 15:23:28 -05:00
x25	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-10-23 11:47:02 -07:00
xfrm	xfrm: make xfrm_bundle_ok local	2010-10-21 03:09:46 -07:00
compat.c	net: Limit socket I/O iovec total length to INT_MAX.	2010-10-28 11:47:52 -07:00
Kconfig	ceph: factor out libceph from Ceph file system	2010-10-20 15:37:28 -07:00
Makefile	ceph: factor out libceph from Ceph file system	2010-10-20 15:37:28 -07:00
nonet.c	llseek: automatically add .llseek fop	2010-10-15 15:53:27 +02:00
socket.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2010-10-30 18:42:58 -07:00
sysctl_net.c
TUNABLE