alistair23-linux/net
Trond Myklebust e89e896d31 Merge branch 'devel' into next
Conflicts:

	fs/nfs/file.c

Fix up the conflict with Jon Corbet's bkl-removal tree
2008-07-15 18:34:16 -04:00
..
9p
802
8021q Merge branch 'linus' into core/rcu 2008-06-16 11:23:36 +02:00
appletalk
atm atm: [br2864] fix routed vcmux support 2008-06-16 17:18:18 -07:00
ax25 ax25: Fix NULL pointer dereference and lockup. 2008-06-03 14:53:46 -07:00
bluetooth bluetooth: rfcomm_dev_state_change deadlock fix 2008-06-03 14:27:17 -07:00
bridge Merge branch 'linus' into core/rcu 2008-07-11 10:46:50 +02:00
can can: add sanity checks 2008-07-05 23:38:43 -07:00
core Merge branch 'generic-ipi' into generic-ipi-for-linus 2008-07-15 21:55:59 +02:00
dccp dccp: Bug in initial acknowledgment number assignment 2008-06-11 11:19:10 +01:00
decnet
econet
ethernet
ieee80211
ipv4 ipv4: fib_trie: Fix lookup error return 2008-07-10 16:52:52 -07:00
ipv6 ipv6: missed namespace context in ipv6_rthdr_rcv 2008-07-10 16:54:50 -07:00
ipx
irda Merge commit 'v2.6.26' into bkl-removal 2008-07-14 15:29:34 -06:00
iucv Merge branch 'generic-ipi' into generic-ipi-for-linus 2008-07-15 21:55:59 +02:00
key ipsec: pfkey should ignore events when no listeners 2008-06-10 14:25:34 -07:00
lapb
llc llc: Fix double accounting of received packets 2008-05-30 02:57:29 -07:00
mac80211 rc80211_pid: Fix fast_start parameter handling 2008-07-09 16:16:31 -04:00
netfilter Merge branch 'core/rcu' into core/rcu-for-linus 2008-07-15 21:10:12 +02:00
netlabel Merge branch 'core/rcu' into core/rcu-for-linus 2008-07-15 21:10:12 +02:00
netlink netlink: Unneeded local variable 2008-07-01 19:55:09 -07:00
netrom
packet
rfkill
rose
rxrpc
sched net-sched: fix filter destruction in atm/hfsc qdisc destruction 2008-07-01 19:53:09 -07:00
sctp sctp: Mark the tsn as received after all allocations finish 2008-07-08 02:28:39 -07:00
sunrpc SUNRPC: Support registering IPv6 interfaces with local rpcbind daemon 2008-07-15 18:08:55 -04:00
tipc
unix af_unix: fix 'poll for write'/connected DGRAM sockets 2008-06-27 19:34:18 -07:00
wanrouter
wireless mac80211: implement EU regulatory domain 2008-06-25 10:31:29 -04:00
x25
xfrm xfrm: Add a XFRM_STATE_AF_UNSPEC flag to xfrm_usersa_info 2008-07-10 16:55:37 -07:00
compat.c
Kconfig
Makefile
nonet.c
socket.c
sysctl_net.c
TUNABLE