David S. Miller 17dce5dfe3 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 ...

Conflicts:

	net/mac80211/mlme.c

2008-09-08 16:59:05 -07:00

..

9p

flag parameters: socket and socketpair

2008-07-24 10:47:27 -07:00

802

list_for_each_rcu must die: networking

2008-07-25 10:53:27 -07:00

8021q

netdev: Handle ->addr_list_lock just like ->_xmit_lock for lockdep.

2008-07-22 14:16:42 -07:00

appletalk

net: convert BUG_TRAP to generic WARN_ON

2008-07-25 21:43:18 -07:00

atm

atm: fix const assignment/discard warnings in the ATM networking driver

2008-07-30 16:31:46 -07:00

ax25

AX.25: Fix sysctl registration if !CONFIG_AX25_DAMA_SLAVE

2008-08-05 18:46:57 -07:00

bluetooth

[Bluetooth] Consolidate maintainers information

2008-08-18 13:23:53 +02:00

bridge

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

2008-09-08 16:59:05 -07:00

can

netns: Use net_eq() to compare net-namespaces for optimization.

2008-07-19 22:34:43 -07:00

core

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

2008-09-08 16:59:05 -07:00

dccp

dccp ccid-3: Replace lazy BUG_ON with condition

2008-08-27 07:22:00 +02:00

decnet

netns: Use net_eq() to compare net-namespaces for optimization.

2008-07-19 22:34:43 -07:00

econet

netns: Use net_eq() to compare net-namespaces for optimization.

2008-07-19 22:34:43 -07:00

ethernet

…

ieee80211

net/ieee80211: adjust error handling

2008-08-22 16:29:49 -04:00

ipv4

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

2008-09-08 16:59:05 -07:00

ipv6

netns : fix kernel panic in timewait socket destruction

2008-09-08 13:17:27 -07:00

ipx

netns: Use net_eq() to compare net-namespaces for optimization.

2008-07-19 22:34:43 -07:00

irda

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

2008-07-20 17:43:29 -07:00

iucv

Merge branch 'linus' into cpus4096-for-linus

2008-07-21 17:19:50 +02:00

key

net: convert BUG_TRAP to generic WARN_ON

2008-07-25 21:43:18 -07:00

lapb

…

llc

netns: Use net_eq() to compare net-namespaces for optimization.

2008-07-19 22:34:43 -07:00

mac80211

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

2008-09-08 16:59:05 -07:00

netfilter

netfilter: nf_conntrack_irc: make sure string is terminated before calling simple_strtoul

2008-09-07 18:21:24 -07:00

netlabel

netns: Use net_eq() to compare net-namespaces for optimization.

2008-07-19 22:34:43 -07:00

netlink

net: convert BUG_TRAP to generic WARN_ON

2008-07-25 21:43:18 -07:00

netrom

netdev: Handle ->addr_list_lock just like ->_xmit_lock for lockdep.

2008-07-22 14:16:42 -07:00

packet

net: convert BUG_TRAP to generic WARN_ON

2008-07-25 21:43:18 -07:00

rfkill

rfkill: rename rfkill_mutex to rfkill_global_mutex

2008-08-29 16:24:11 -04:00

rose

netdev: Handle ->addr_list_lock just like ->_xmit_lock for lockdep.

2008-07-22 14:16:42 -07:00

rxrpc

net/rxrpc: Use an IS_ERR test rather than a NULL test

2008-08-13 02:40:48 -07:00

sched

warn: Turn the netdev timeout WARN_ON() into a WARN()

2008-09-08 16:17:42 -07:00

sctp

sctp: fix random memory dereference with SCTP_HMAC_IDENT option.

2008-08-27 16:09:49 -07:00

sunrpc

sunrpc: fix possible overrun on read of /proc/sys/sunrpc/transports

2008-09-01 14:24:24 -04:00

tipc

tipc: Don't use structure names which easily globally conflict.

2008-09-02 23:38:32 -07:00

unix

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

2008-07-26 20:23:44 -07:00

wanrouter

wanmain.c doesn't need syncppp.h

2008-07-23 23:00:36 +02:00

wireless

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

2008-09-08 16:59:05 -07:00

x25

netns: Use net_eq() to compare net-namespaces for optimization.

2008-07-19 22:34:43 -07:00

xfrm

ipsec: Fix deadlock in xfrm_state management.

2008-09-02 20:14:15 -07:00

compat.c

flag parameters: paccept

2008-07-24 10:47:27 -07:00

Kconfig

WIRELESS: Make wireless one-click selectable.

2008-08-22 16:29:50 -04:00

Makefile

…

nonet.c

…

socket.c

SL*B: drop kmem cache argument from constructor

2008-07-26 12:00:07 -07:00

sysctl_net.c

missing bits of net-namespace / sysctl

2008-07-27 09:45:34 -07:00

TUNABLE

…