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

Resolved logic conflicts causing a build failure due to
drivers/net/r8169.c changes using a patch from Stephen Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>

2011-04-26 12:16:46 -07:00

..

9p

…

802

…

8021q

…

appletalk

…

atm

…

ax25

…

batman-adv

…

bluetooth

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

2011-04-26 12:16:46 -07:00

bridge

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

2011-04-26 12:16:46 -07:00

caif

…

can

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

2011-04-26 12:16:46 -07:00

ceph

…

core

bonding: move processing of recv handlers into handle_frame()

2011-04-25 12:00:30 -07:00

dcb

…

dccp

…

decnet

…

dns_resolver

…

dsa

…

econet

…

ethernet

…

ieee802154

…

ipv4

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

2011-04-26 12:16:46 -07:00

ipv6

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

2011-04-26 12:16:46 -07:00

ipx

…

irda

…

iucv

…

key

…

l2tp

…

lapb

…

llc

…

mac80211

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

2011-04-26 12:16:46 -07:00

netfilter

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

2011-04-26 12:16:46 -07:00

netlabel

…

netlink

…

netrom

…

packet

…

phonet

…

rds

…

rfkill

…

rose

…

rxrpc

…

sched

…

sctp

…

sunrpc

…

tipc

…

unix

…

wanrouter

…

wimax

…

wireless

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

2011-04-25 14:34:25 -04:00

x25

…

xfrm

…

compat.c

…

Kconfig

…

Makefile

…

nonet.c

…

socket.c

…

sysctl_net.c

…

TUNABLE

…