John W. Linville 50c4afb991 mlme.c: fixup some merge damage ...

This one got renamed, complicating the merge a bit...this should restore
it to its intended state.

Signed-off-by: John W. Linville <linville@tuxdriver.com>

2008-04-16 11:42:59 -04:00

..

9p

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

2008-04-03 14:33:42 -07:00

802

…

8021q

[VLAN]: Handle vlan devices net namespace changing.

2008-04-16 00:57:01 -07:00

appletalk

[NET] NETNS: Omit net_device->nd_net without CONFIG_NET_NS.

2008-03-26 04:39:53 +09:00

atm

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

2008-04-14 02:30:23 -07:00

ax25

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

2008-04-14 02:30:23 -07:00

bluetooth

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

2008-04-02 22:35:23 -07:00

bridge

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6.26

2008-04-14 03:50:43 -07:00

can

CAN: use hrtimers in can-bcm protocol

2008-04-15 19:29:14 -07:00

core

[NET]: Do not allocate unneeded memory for dev->priv alignment.

2008-04-16 02:17:42 -07:00

dccp

[DCCP]: Fix comment about control sockets.

2008-04-14 02:38:45 -07:00

decnet

[NET] NETNS: Omit sock->sk_net without CONFIG_NET_NS.

2008-03-26 04:39:55 +09:00

econet

[NET] NETNS: Omit net_device->nd_net without CONFIG_NET_NS.

2008-03-26 04:39:53 +09:00

ethernet

[NET]: Return more appropriate error from eth_validate_addr().

2008-04-13 22:45:40 -07:00

ieee80211

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

2008-04-14 02:30:23 -07:00

ipv4

[NETNS]: Add netns refcnt debug for inet bind buckets.

2008-04-16 02:01:11 -07:00

ipv6

[NETNS]: Add netns refcnt debug for dst ops.

2008-04-16 02:01:34 -07:00

ipx

[NET] NETNS: Omit net_device->nd_net without CONFIG_NET_NS.

2008-03-26 04:39:53 +09:00

irda

[IRDA]: Remove irlan_eth_send_gratuitous_arp()

2008-04-15 00:29:24 -07:00

iucv

iucv: Delay bus registration until core is ready.

2008-04-10 02:12:45 -07:00

key

LSM: Make the Labeled IPsec hooks more stack friendly

2008-04-12 19:07:52 -07:00

lapb

…

llc

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

2008-04-02 22:35:23 -07:00

mac80211

mlme.c: fixup some merge damage

2008-04-16 11:42:59 -04:00

netfilter

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6.26

2008-04-14 03:50:43 -07:00

netlabel

[NET] NETNS: Omit net_device->nd_net without CONFIG_NET_NS.

2008-03-26 04:39:53 +09:00

netlink

[NET] NETNS: Omit namespace comparision without CONFIG_NET_NS.

2008-03-26 04:40:00 +09:00

netrom

[NET] NETNS: Omit sock->sk_net without CONFIG_NET_NS.

2008-03-26 04:39:55 +09:00

packet

[NET] NETNS: Omit sock->sk_net without CONFIG_NET_NS.

2008-03-26 04:39:55 +09:00

rfkill

…

rose

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

2008-04-02 22:35:23 -07:00

rxrpc

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

2008-04-03 14:33:42 -07:00

sched

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

2008-04-14 02:30:23 -07:00

sctp

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

2008-04-14 02:30:23 -07:00

sunrpc

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

2008-04-03 14:33:42 -07:00

tipc

[TIPC]: Enhance validation of format on incoming messages

2008-04-15 19:04:54 -07:00

unix

[AF_UNIX]: Use SEQ_START_TOKEN

2008-04-12 19:04:38 -07:00

wanrouter

…

wireless

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

2008-04-14 02:30:23 -07:00

x25

[NET] NETNS: Omit sock->sk_net without CONFIG_NET_NS.

2008-03-26 04:39:55 +09:00

xfrm

[XFRM]: Compilation warnings in xfrm_user.c.

2008-04-14 14:47:48 -07:00

compat.c

…

Kconfig

[IPV4]: Fix size description of CONFIG_INET.

2008-03-04 15:18:22 +09:00

Makefile

…

nonet.c

…

socket.c

[NETNS]: Introduce a netns_core structure.

2008-03-31 19:41:14 -07:00

sysctl_net.c

…

TUNABLE

…