David S. Miller 9cbc1cb8cd Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 ... Conflicts: Documentation/feature-removal-schedule.txt drivers/scsi/fcoe/fcoe.c net/core/drop_monitor.c net/core/net-traces.c		2009-06-15 03:02:23 -07:00
..
9p	virtio: find_vqs/del_vqs virtio operations	2009-06-12 22:16:36 +09:30
802	net: remove COMPAT_NET_DEV_OPS	2009-05-25 01:53:53 -07:00
8021q	8021q: Vlan driver should use rcu_barrier() on unload instead of syncronize_net()	2009-06-10 01:11:22 -07:00
appletalk	appletalk: Use frag list abstraction interfaces.	2009-06-09 00:17:44 -07:00
atm	net: fix network drivers ndo_start_xmit() return values (part 7)	2009-06-13 01:18:43 -07:00
ax25	ax25: proc uid file misses header	2009-04-20 02:14:59 -07:00
bluetooth	Bluetooth: Fix Kconfig issue with RFKILL integration	2009-06-14 15:30:51 +02:00
bridge	bridge: Simplify interface for ATM LANE	2009-06-11 21:03:21 -07:00
can	can: af_can.c use rcu_barrier() on module unload.	2009-06-10 01:11:24 -07:00
core	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
dcb
dccp	net: skb->dst accessors	2009-06-03 02:51:04 -07:00
decnet	net: skb->dst accessors	2009-06-03 02:51:04 -07:00
dsa	net: convert unicast addr list	2009-05-29 22:12:32 -07:00
econet	econet: Use SKB queue and list helpers instead of doing it by-hand.	2009-05-28 16:46:29 -07:00
ethernet	net: remove COMPAT_NET_DEV_OPS	2009-05-25 01:53:53 -07:00
ieee802154	ieee802154: Use '%Zu' printf format for size_t.	2009-06-11 02:10:19 -07:00
ipv4	ipv4: Fix fib_trie rebalancing	2009-06-15 02:31:29 -07:00
ipv6	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
ipx
irda	irda: Use SKB queue and list helpers instead of doing it by-hand.	2009-05-28 23:26:33 -07:00
iucv	af_iucv: Fix merge.	2009-04-23 06:37:16 -07:00
key
lapb
llc	llc: Kill outdated and incorrect comment.	2009-05-28 23:31:56 -07:00
mac80211	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
netfilter	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
netlabel	netlabel: Use genl_register_family_with_ops()	2009-05-21 16:50:24 -07:00
netlink	genetlink: Introduce genl_register_family_with_ops()	2009-05-21 16:50:22 -07:00
netrom	net/netrom: Fix socket locking	2009-04-22 00:49:51 -07:00
packet	net: skb->dst accessors	2009-06-03 02:51:04 -07:00
phonet	phonet: Use frag list abstraction interfaces.	2009-06-09 00:24:06 -07:00
rds	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-05-18 21:08:20 -07:00
rfkill	rfkill: don't impose global states on resume (just restore the previous states)	2009-06-10 13:28:37 -04:00
rose	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
rxrpc	RxRPC: Error handling for rxrpc_alloc_connection()	2009-05-21 15:22:02 -07:00
sched	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
sctp	sctp: protocol.c call rcu_barrier() on unload.	2009-06-10 01:11:25 -07:00
sunrpc	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
tipc	tipc: Use genl_register_family_with_ops()	2009-05-21 16:50:23 -07:00
unix	New helper - current_umask()	2009-03-31 23:00:26 -04:00
wanrouter
wimax	wimax: fix warning caused by not checking retval of rfkill_set_hw_state()	2009-06-11 11:12:48 -07:00
wireless	cfg80211: fix rfkill locking problem	2009-06-10 13:28:41 -04:00
x25
xfrm	xfrm: Use frag list abstraction interfaces.	2009-06-09 00:24:07 -07:00
compat.c
Kconfig	net: add IEEE 802.15.4 socket family implementation	2009-06-09 05:25:32 -07:00
Makefile	net: add IEEE 802.15.4 socket family implementation	2009-06-09 05:25:32 -07:00
nonet.c
socket.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2009-04-06 18:05:43 -07:00
sysctl_net.c
TUNABLE