Patrick McHardy 1e4b105712 Merge branch 'master' of /repos/git/net-next-2.6 ...

Conflicts:
	net/bridge/br_device.c
	net/bridge/br_forward.c

Signed-off-by: Patrick McHardy <kaber@trash.net>

2010-05-10 18:39:28 +02:00

..

9p

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs

2010-04-05 13:42:54 -07:00

802

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

2010-04-11 14:53:53 -07:00

8021q

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

2010-04-11 14:53:53 -07:00

appletalk

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

2010-04-11 14:53:53 -07:00

atm

net: sock_def_readable() and friends RCU conversion

2010-05-01 15:00:15 -07:00

ax25

net: sk_sleep() helper

2010-04-20 16:37:13 -07:00

bluetooth

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

2010-05-02 22:02:06 -07:00

bridge

Merge branch 'master' of /repos/git/net-next-2.6

2010-05-10 18:39:28 +02:00

caif

Bugfix: Link selection was swapped in switch.

2010-04-28 12:55:15 -07:00

can

can: avoids a false warning

2010-04-13 03:03:14 -07:00

core

rps: Various optimizations

2010-05-06 22:07:48 -07:00

dcb

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

dccp

net: sock_def_readable() and friends RCU conversion

2010-05-01 15:00:15 -07:00

decnet

Merge branch 'master' of /repos/git/net-next-2.6

2010-05-10 18:39:28 +02:00

dsa

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

2010-04-11 14:53:53 -07:00

econet

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

ethernet

net: Inline skb_pull() in eth_type_trans().

2010-05-02 02:21:44 -07:00

ieee802154

ieee802154: Fix oops during ieee802154_sock_ioctl

2010-04-26 11:20:32 -07:00

ipv4

Merge branch 'master' of /repos/git/net-next-2.6

2010-05-10 18:39:28 +02:00

ipv6

Merge branch 'master' of /repos/git/net-next-2.6

2010-05-10 18:39:28 +02:00

ipx

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

irda

net: sk_sleep() helper

2010-04-20 16:37:13 -07:00

iucv

net: sock_def_readable() and friends RCU conversion

2010-05-01 15:00:15 -07:00

key

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

l2tp

l2tp_eth: fix memory allocation

2010-04-23 16:37:33 -07:00

lapb

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

llc

net: sk_sleep() helper

2010-04-20 16:37:13 -07:00

mac80211

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

2010-05-05 16:14:16 -04:00

netfilter

Merge branch 'master' of /repos/git/net-next-2.6

2010-05-10 18:39:28 +02:00

netlabel

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

2010-04-06 08:34:06 -07:00

netlink

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

2010-04-11 14:53:53 -07:00

netrom

net: sk_sleep() helper

2010-04-20 16:37:13 -07:00

packet

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

2010-04-21 01:14:25 -07:00

phonet

net: sock_def_readable() and friends RCU conversion

2010-05-01 15:00:15 -07:00

rds

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

2010-04-27 12:49:13 -07:00

rfkill

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

2010-04-11 14:53:53 -07:00

rose

net: sk_sleep() helper

2010-04-20 16:37:13 -07:00

rxrpc

net: sock_def_readable() and friends RCU conversion

2010-05-01 15:00:15 -07:00

sched

Merge branch 'master' of /repos/git/net-next-2.6

2010-05-10 18:39:28 +02:00

sctp

Merge branch 'net-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vxy/lksctp-dev

2010-05-03 16:24:31 -07:00

sunrpc

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

2010-04-21 01:14:25 -07:00

tipc

net: sk_sleep() helper

2010-04-20 16:37:13 -07:00

unix

unix/garbage: kill copy of the skb queue walker

2010-05-03 15:39:58 -07:00

wanrouter

headers: smp_lock.h redux

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

wimax

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

2010-04-11 14:53:53 -07:00

wireless

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

2010-05-05 16:14:16 -04:00

x25

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

2010-04-27 12:49:13 -07:00

xfrm

xfrm: potential uninitialized variable num_xfrms

2010-04-30 16:40:05 -07:00

compat.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09: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

net: sock_def_readable() and friends RCU conversion

2010-05-01 15:00:15 -07:00

sysctl_net.c

net: spread __net_init, __net_exit

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

TUNABLE

…