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

Conflicts:
	drivers/net/bonding/bond_main.c
	drivers/net/via-velocity.c
	drivers/net/wireless/iwlwifi/iwl-agn.c

2010-04-06 23:53:30 -07:00

..

9p

9p: Change the name of new protocol from 9p2010.L to 9p2000.L

2010-03-13 08:57:29 -06:00

802

net: convert multicast list to list_head

2010-04-03 14:22:15 -07:00

8021q

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

2010-04-06 23:53:30 -07:00

appletalk

net: convert multicast list to list_head

2010-04-03 14:22:15 -07:00

atm

atm: Use kasprintf

2010-03-21 18:34:15 -07:00

ax25

net: ax25: use seq_hlist_foo() helpers

2010-02-10 11:12:09 -08:00

bluetooth

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

2010-04-06 23:53:30 -07:00

bridge

bridge: cleanup: remove unused assignment

2010-03-21 21:21:58 -07:00

caif

net-caif: using kmalloc/kfree requires the include of slab.h

2010-04-01 00:28:49 -07:00

can

net: check the length of the socket address passed to connect(2)

2010-04-01 17:26:01 -07:00

core

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

2010-04-06 23:53:30 -07:00

dcb

const: struct nla_policy

2010-02-18 14:30:18 -08:00

dccp

net: remove trailing space in messages

2010-03-24 14:01:54 -07:00

decnet

net: convert multicast list to list_head

2010-04-03 14:22:15 -07:00

dsa

net: move address list functions to a separate file

2010-04-03 14:22:11 -07:00

econet

net: use net_eq to compare nets

2009-11-25 15:14:13 -08:00

ethernet

llc: use dev_hard_header

2009-12-26 20:38:23 -08:00

ieee802154

net: check the length of the socket address passed to connect(2)

2010-04-01 17:26:01 -07:00

ipv4

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

2010-04-06 23:53:30 -07:00

ipv6

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

2010-04-06 23:53:30 -07:00

ipx

net: ipx: use seq_list_foo() helpers

2010-02-10 12:31:10 -08:00

irda

net: remove trailing space in messages

2010-03-24 14:01:54 -07:00

iucv

const: constify remaining dev_pm_ops

2009-12-15 08:53:25 -08:00

key

af_key: return error if pfkey_xfrm_policy2msg_prep() fails

2010-03-24 13:28:27 -07:00

l2tp

l2tp: unmanaged L2TPv3 tunnels fixes

2010-04-04 01:02:46 -07:00

lapb

net: remove NET_RX_BAD and NET_RX_CN* defines

2009-07-05 19:15:35 -07:00

llc

llc: cleanup: remove dead code from llc_init()

2010-03-24 13:34:08 -07:00

mac80211

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

2010-04-06 23:53:30 -07:00

netfilter

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

2010-03-25 11:48:58 -07:00

netlabel

netlabel: Fix several rcu_dereference() calls used without RCU read locks

2010-04-01 18:32:08 -07:00

netlink

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

2010-04-06 23:53:30 -07:00

netrom

net: netrom: use seq_hlist_foo() helpers

2010-02-10 11:12:08 -08:00

packet

net: convert multicast list to list_head

2010-04-03 14:22:15 -07:00

phonet

phonet: use for_each_set_bit()

2010-03-15 16:00:47 -07:00

rds

rds: cleanup: remove unneeded variable

2010-03-24 13:34:09 -07:00

rfkill

rename new rfkill sysfs knobs

2010-03-19 15:48:25 -04:00

rose

net: rose: use seq_hlist_foo() helpers

2010-02-10 11:12:08 -08:00

rxrpc

rxrpc: Check allocation failure.

2010-03-22 09:57:19 -07:00

sched

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

2010-04-06 23:53:30 -07:00

sctp

SCTP: Change to use ipv6_addr_copy()

2010-04-03 15:10:21 -07:00

sunrpc

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

2010-04-06 23:53:30 -07:00

tipc

TIPC: Updated topology subscription protocol according to latest spec

2010-04-06 19:50:19 -07:00

unix

AF_UNIX: update locking comment

2010-02-18 14:12:06 -08:00

wanrouter

headers: smp_lock.h redux

2009-07-12 12:22:34 -07:00

wimax

wimax: remove unneeded variable

2010-03-24 13:34:09 -07:00

wireless

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

2010-04-06 23:53:30 -07:00

x25

net: backlog functions rename

2010-03-05 13:34:03 -08:00

xfrm

xfrm: remove policy lock when accessing policy->walk.dead

2010-04-01 19:41:35 -07:00

compat.c

net: use compat helper functions in compat_sys_recvmmsg

2009-12-11 15:07:57 -08:00

Kconfig

l2tp: Split pppol2tp patch into separate l2tp and ppp parts

2010-04-03 14:56:02 -07:00

Makefile

l2tp: Split pppol2tp patch into separate l2tp and ppp parts

2010-04-03 14:56:02 -07:00

nonet.c

…

socket.c

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

2010-04-06 23:53:30 -07:00

sysctl_net.c

net: spread __net_init, __net_exit

2010-01-17 19:16:02 -08:00

TUNABLE

…