Linus Torvalds 609eac1c15 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs ... * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs: fs/9p: iattr_valid flags are kernel internal flags map them to 9p values. fs/9p: We should not allocate a new inode when creating hardlines. fs/9p: v9fs_stat2inode should update suid/sgid bits. 9p: Reduce object size with CONFIG_NET_9P_DEBUG fs/9p: check schedule_timeout_interruptible return value Fix up trivial conflicts in fs/9p/{vfs_inode.c,vfs_inode_dotl.c} due to debug messages having changed to use p9_debug() on one hand, and the changes for umode_t on the other.		2012-01-10 15:09:01 -08:00
..
9p	9p: Reduce object size with CONFIG_NET_9P_DEBUG	2012-01-05 10:51:44 -06:00
802
8021q	vlan: static functions	2011-12-14 02:39:30 -05:00
appletalk
atm	net: Rename dst_get_neighbour{, _raw} to dst_get_neighbour_noref{, _raw}.	2011-12-05 15:20:19 -05:00
ax25	ax25: avoid overflows in ax25_setsockopt()	2011-12-28 14:08:08 -05:00
batman-adv	batman-adv: Fix merge error.	2011-12-16 15:07:28 -05:00
bluetooth	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-01-04 21:35:43 -05:00
bridge	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2011-12-23 17:13:56 -05:00
caif	Merge branch 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2012-01-09 13:08:28 -08:00
can
ceph	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client	2011-12-13 14:59:42 -08:00
core	net: Fix build with INET disabled.	2012-01-09 13:44:23 -08:00
dcb
dccp	module_param: make bool parameters really bool (net & drivers/net)	2011-12-19 22:27:29 -05:00
decnet	ipv6: Use universal hash for NDISC.	2011-12-28 15:06:58 -05:00
dns_resolver
dsa
econet
ethernet
ieee802154
ipv4	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-01-09 14:46:52 -08:00
ipv6	ipv6/addrconf: speedup /proc/net/if_inet6 filling	2012-01-04 16:00:57 -05:00
ipx
irda	irda: use msecs_to_jiffies() rather than manual calculation	2011-12-21 15:46:22 -05:00
iucv	af_iucv: get rid of state IUCV_SEVERED	2011-12-20 14:05:03 -05:00
key	net: use IS_ENABLED(CONFIG_IPV6)	2011-12-11 18:25:16 -05:00
l2tp
lapb
llc	llc: llc_cmsg_rcv was getting called after sk_eat_skb.	2011-12-19 15:58:52 -05:00
mac80211	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2012-01-05 10:13:24 -05:00
netfilter	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-01-08 13:21:22 -08:00
netlabel	net: use IS_ENABLED(CONFIG_IPV6)	2011-12-11 18:25:16 -05:00
netlink	genetlink: add auto module loading	2011-12-28 13:48:55 -05:00
netrom	netrom: avoid overflows in nr_setsockopt()	2011-12-28 14:08:08 -05:00
nfc	NFC: Export a new attribute nfcid1 in target info	2012-01-04 14:30:43 -05:00
openvswitch	openvswitch: small potential memory leak in ovs_vport_alloc()	2011-12-06 12:58:57 -05:00
packet	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2011-12-30 13:04:14 -05:00
phonet
rds
rfkill	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2012-01-05 10:13:24 -05:00
rose
rxrpc	net: fix assignment of 0/1 to bool variables.	2011-12-19 22:27:29 -05:00
sched	net_sched: red: split red_parms into parms and vars	2012-01-05 14:01:21 -05:00
sctp	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-01-08 13:21:22 -08:00
sunrpc	Merge branch 'nfs-for-3.3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs	2012-01-10 14:57:40 -08:00
tipc	tipc: rename struct bearer_name to struct tipc_bearer_names	2011-12-29 21:53:30 -05:00
unix	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-01-09 14:46:52 -08:00
wanrouter
wimax
wireless	wireless: Treat IPv6 diffserv the same as IPv4 for 802.11e	2012-01-04 14:30:43 -05:00
x25	net:x25: use IS_ENABLED	2011-12-16 15:49:52 -05:00
xfrm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2011-12-23 17:13:56 -05:00
compat.c
Kconfig	net: Add Open vSwitch kernel components.	2011-12-03 09:35:17 -08:00
Makefile	net: Add Open vSwitch kernel components.	2011-12-03 09:35:17 -08:00
nonet.c
socket.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2012-01-06 17:22:09 -08:00
sysctl_net.c