David S. Miller 06802a819a Merge branch 'master' of ../net-2.6/ ...

Conflicts:

	net/ipv6/ndisc.c

2008-03-23 22:54:03 -07:00

..

9p

Merge branch 'master' of ../net-2.6/

2008-03-23 22:54:03 -07:00

802

[TR] net/802/tr.c: sysctl_tr_rif_timeout static

2008-01-31 19:28:31 -08:00

8021q

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

2008-03-18 00:37:55 -07:00

appletalk

[ATALK/DECNET]: Use seq_open_private in appletalk and decnet.

2008-02-29 11:38:24 -08:00

atm

Merge branch 'master' of ../net-2.6/

2008-03-23 22:54:03 -07:00

ax25

[AX25] ax25_out: check skb for NULL in ax25_kick()

2008-02-17 22:31:19 -08:00

bluetooth

bluetooth: make bnep_sock_cleanup() return void

2008-03-05 18:47:40 -08:00

bridge

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

2008-03-21 03:42:24 -07:00

can

[CAN]: Minor clean-ups

2008-02-07 18:05:04 -08:00

core

[NET]: Add per-connection option to set max TSO frame size

2008-03-21 03:43:19 -07:00

dccp

[SOCK]: Add udp_hash member to struct proto.

2008-03-22 16:50:58 -07:00

decnet

[ATALK/DECNET]: Use seq_open_private in appletalk and decnet.

2008-02-29 11:38:24 -08:00

econet

…

ethernet

…

ieee80211

the scheduled ieee80211 softmac removal

2008-03-13 16:02:31 -04:00

ipv4

Merge branch 'master' of ../net-2.6/

2008-03-23 22:54:03 -07:00

ipv6

[TCP]: Shrink syncookie_secret by 8 byte.

2008-03-23 22:21:28 -07:00

ipx

[IPX]: Use proc_create() to setup ->proc_fops first

2008-02-28 14:06:14 -08:00

irda

net: replace remaining __FUNCTION__ occurrences

2008-03-05 20:47:47 -08:00

iucv

iucv: fix build error on !SMP

2008-03-03 12:12:33 -08:00

key

[AF_KEY]: Dump SA/SP entries non-atomically

2008-03-03 23:40:12 -08:00

lapb

…

llc

net: replace remaining __FUNCTION__ occurrences

2008-03-05 20:47:47 -08:00

mac80211

the scheduled rc80211-simple.c removal

2008-03-13 16:02:31 -04:00

netfilter

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

2008-03-21 03:42:24 -07:00

netlabel

[NETLABEL]: Move some initialization code into __init section.

2008-02-17 22:33:57 -08:00

netlink

netlink: make socket filters work on netlink

2008-03-21 15:46:12 -07:00

netrom

…

packet

[AF_PACKET]: Remove unused variable.

2008-03-23 22:42:34 -07:00

rfkill

PM: Introduce PM_EVENT_HIBERNATE callback state

2008-02-23 10:40:04 -08:00

rose

…

rxrpc

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

2008-03-18 00:37:55 -07:00

sched

Merge branch 'master' of ../net-2.6/

2008-03-23 22:54:03 -07:00

sctp

[SCTP]: Remove redundant wrapper functions.

2008-03-23 22:47:08 -07:00

sunrpc

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

2008-03-18 00:37:55 -07:00

tipc

[TIPC]: Update version to 1.6.3

2008-03-06 15:08:40 -08:00

unix

net: replace remaining __FUNCTION__ occurrences

2008-03-05 20:47:47 -08:00

wanrouter

[WANROUTER]: Use proc_create() to setup ->proc_fops first

2008-02-28 14:15:56 -08:00

wireless

nl80211/cfg80211: support for mesh, sta dumping

2008-03-06 15:30:41 -05:00

x25

[X25]: Use proc_create() to setup ->proc_fops first

2008-02-28 14:16:33 -08:00

xfrm

[XFRM]: Speed up xfrm_policy and xfrm_state walking

2008-02-28 21:31:08 -08:00

compat.c

…

Kconfig

[IPV4]: Fix size description of CONFIG_INET.

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

Makefile

…

nonet.c

…

socket.c

[DLCI]: Fix tiny race between module unload and sock_ioctl.

2008-03-21 15:58:52 -07:00

sysctl_net.c

…

TUNABLE

…