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

9p: Kill set but unused variable in 9p_client_{read,write}() and p9_client_readdir()

2011-04-12 15:58:41 -07:00

802

net/802: add __rcu annotations

2010-10-25 13:09:44 -07:00

8021q

bonding, ipv4, ipv6, vlan: Handle NETDEV_BONDING_FAILOVER like NETDEV_NOTIFY_PEERS

2011-04-17 23:36:03 -07:00

appletalk

appletalk: Fix OOPS in atalk_release().

2011-03-31 18:59:10 -07:00

atm

atm: lec: Fix set-but-unused variables.

2011-04-17 00:48:36 -07:00

ax25

ax25: Fix set-but-unused variable.

2011-04-17 00:48:31 -07:00

batman-adv

net: batman-adv: remove rx_csum ethtool_ops

2011-04-20 01:30:40 -07:00

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

caif: Fix set-but-unused variables.

2011-04-17 16:57:55 -07:00

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

Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6

2011-04-07 11:14:49 -07:00

core

bonding: move processing of recv handlers into handle_frame()

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

dcb

net: dcbnl: Update copyright dates

2011-03-14 17:02:42 -07:00

dccp

inet: constify ip headers and in6_addr

2011-04-22 11:04:14 -07:00

decnet

decnet: Don't leak entries when rebuilding zone.

2011-04-17 20:47:07 -07:00

dns_resolver

DNS: Fix a NULL pointer deref when trying to read an error key [CVE-2011-1076]

2011-03-04 09:56:19 +11:00

dsa

net: dsa: remove ethtool_ops->set_sg

2011-04-20 01:30:39 -07:00

econet

econet: Fix set-but-unused variable.

2011-04-17 00:15:22 -07:00

ethernet

eth: fix new kernel-doc warning

2011-01-12 19:00:40 -08:00

ieee802154

ieee802154: Remove hacked CFLAGS in net/ieee802154/Makefile

2011-04-12 15:33:23 -07:00

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

ipx: fix ipx_release()

2011-03-21 18:16:39 -07:00

irda

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

2011-04-19 00:21:33 -07:00

iucv

Fix common misspellings

2011-03-31 11:26:23 -03:00

key

inet: constify ip headers and in6_addr

2011-04-22 11:04:14 -07:00

l2tp

l2tp: Fix set-but-unused variables.

2011-04-17 17:01:05 -07:00

lapb

Net: lapb: Makefile: Remove deprecated kbuild goal definitions

2010-11-22 08:16:14 -08:00

llc

llc: Fix length check in llc_fixup_skb().

2011-04-11 18:59:05 -07:00

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

netlabel: Fix set-but-unused variables.

2011-04-17 17:01:49 -07:00

netlink

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

2011-03-03 21:27:42 -08:00

netrom

NET: AX.25, NETROM, ROSE: Remove SOCK_DEBUG calls

2011-04-14 00:20:07 -07:00

packet

af_packet: struct socket declared/assigned but unused

2011-03-07 15:51:13 -08:00

phonet

Phonet: convert bound sockets hash list to RCU

2011-04-14 21:32:53 -07:00

rds

Fix common misspellings

2011-03-31 11:26:23 -03:00

rfkill

rfkill: Regulator consumer driver for rfkill

2011-04-19 15:38:02 -04:00

rose

NET: AX.25, NETROM, ROSE: Remove SOCK_DEBUG calls

2011-04-14 00:20:07 -07:00

rxrpc

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

2011-03-16 16:29:25 -07:00

sched

inet: constify ip headers and in6_addr

2011-04-22 11:04:14 -07:00

sctp

inet: constify ip headers and in6_addr

2011-04-22 11:04:14 -07:00

sunrpc

Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6

2011-04-08 11:47:35 -07:00

tipc

Fix common misspellings

2011-03-31 11:26:23 -03:00

unix

Fix common misspellings

2011-03-31 11:26:23 -03:00

wanrouter

Fix common misspellings

2011-03-31 11:26:23 -03:00

wimax

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

2010-05-20 21:04:44 -07:00

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

Fix common misspellings

2011-03-31 11:26:23 -03:00

xfrm

inet: constify ip headers and in6_addr

2011-04-22 11:04:14 -07:00

compat.c

net: Limit socket I/O iovec total length to INT_MAX.

2010-10-28 11:47:52 -07:00

Kconfig

net: RPS: Enable hardware acceleration of RFS

2011-01-24 14:53:01 -08:00

Makefile

net: Enter net/ipv6/ even if CONFIG_IPV6=n

2011-03-07 12:50:52 -08:00

nonet.c

llseek: automatically add .llseek fop

2010-10-15 15:53:27 +02:00

socket.c

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

2011-04-11 13:44:25 -07:00

sysctl_net.c

net: Remove unnecessary returns from void function()s

2010-05-17 23:23:14 -07:00

TUNABLE

…