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

Conflicts:

	Documentation/feature-removal-schedule.txt
	drivers/net/wan/hdlc_fr.c
	drivers/net/wireless/iwlwifi/iwl-4965.c
	drivers/net/wireless/iwlwifi/iwl3945-base.c

2008-07-05 23:08:07 -07:00

..

9p

9p: fix error path during early mount

2008-05-14 19:23:27 -05:00

802

net: Add GARP applicant-only participant

2008-07-05 21:26:13 -07:00

8021q

vlan: Add GVRP support

2008-07-05 21:26:57 -07:00

appletalk

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

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

atm

atm: use const where reasonable

2008-06-17 16:20:06 -07:00

ax25

ax25: Fix std timer socket destroy handling.

2008-06-17 21:26:37 -07:00

bluetooth

net: remove CVS keywords

2008-06-11 21:00:38 -07:00

bridge

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

2008-07-05 23:08:07 -07:00

can

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

2008-05-08 19:03:26 -07:00

core

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

2008-07-05 23:08:07 -07:00

dccp

net: change proto destroy method to return void

2008-06-14 17:04:49 -07:00

decnet

net: add fib_rules_ops to flush_cache method

2008-07-05 19:01:28 -07:00

econet

econet: Use sock_orphan() instead of open-coded (and buggy) variant.

2008-06-17 03:01:47 -07:00

ethernet

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

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

ieee80211

wext: Emit event stream entries correctly when compat.

2008-06-16 18:50:49 -07:00

ipv4

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

2008-07-05 23:08:07 -07:00

ipv6

MIB: add struct net to UDP6_INC_STATS_BH

2008-07-05 21:19:40 -07:00

ipx

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

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

irda

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

2008-06-10 02:22:26 -07:00

iucv

af_iucv: exploit target message class support of IUCV

2008-06-09 15:51:03 -07:00

key

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

2008-06-13 20:52:39 -07:00

lapb

[LAPB] net/lapb/lapb_iface.c: use LIST_HEAD instead of LIST_HEAD_INIT

2008-01-28 14:56:52 -08:00

llc

llc: Use sock_graft() instead of by-hand version.

2008-06-17 01:21:03 -07:00

mac80211

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

2008-07-05 23:08:07 -07:00

netfilter

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

2008-07-05 23:08:07 -07:00

netlabel

netlabel: Fix a problem when dumping the default IPv6 static labels

2008-06-27 20:12:32 -07:00

netlink

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

2008-07-05 23:08:07 -07:00

netrom

netrom: Kill spurious NULL'ing of sk->sk_socket.

2008-06-17 03:19:58 -07:00

packet

net: remove CVS keywords

2008-06-11 21:00:38 -07:00

rfkill

rfkill: rename the rfkill_state states and add block-locked state

2008-06-26 14:21:22 -04:00

rose

rose: improving AX25 routing frames via ROSE network

2008-06-17 17:08:32 -07:00

rxrpc

MIB: add struct net to UDP_INC_STATS_BH

2008-07-05 21:18:48 -07:00

sched

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

2008-07-05 23:08:07 -07:00

sctp

sctp: Mark GET_PEER|LOCAL_ADDR_OLD deprecated.

2008-07-01 20:06:22 -07:00

sunrpc

net: remove CVS keywords

2008-06-11 21:00:38 -07:00

tipc

tipc: Message rejection rework preparatory changes

2008-06-04 17:54:48 -07:00

unix

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

2008-06-28 01:19:40 -07:00

wanrouter

wanrouter: Push down BKL

2008-05-25 23:41:40 -07:00

wireless

mac80211: implement EU regulatory domain

2008-06-25 10:31:29 -04:00

x25

x25: Use sock_orphan() instead of open-coded (and buggy) variant.

2008-06-17 03:05:13 -07:00

xfrm

xfrm: xfrm_algo: correct usage of RIPEMD-160

2008-06-04 12:04:55 -07:00

compat.c

net: Add compat support for getsockopt (MCAST_MSFILTER)

2008-04-29 03:23:22 -07:00

Kconfig

net: Add STP demux layer

2008-07-05 21:25:39 -07:00

Makefile

[CAN]: Add PF_CAN core module

2008-01-28 14:54:10 -08:00

nonet.c

…

socket.c

wext: Dispatch and handle compat ioctls entirely in net/wireless/wext.c

2008-06-16 18:32:46 -07:00

sysctl_net.c

net: remove CVS keywords

2008-06-11 21:00:38 -07:00

TUNABLE

…