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

Conflicts:
	drivers/net/sh_eth.c

2009-10-27 01:03:26 -07:00

..

9p

virtio: add virtio IDs file

2009-09-23 22:26:32 +09:30

802

net: remove COMPAT_NET_DEV_OPS

2009-05-25 01:53:53 -07:00

8021q

vlan: allow null VLAN ID to be used

2009-10-27 01:02:33 -07:00

appletalk

net: mark net_proto_ops as const

2009-10-07 01:10:46 -07:00

atm

net: Generalize socket rx gap / receive queue overflow cmsg

2009-10-12 13:26:31 -07:00

ax25

net: mark net_proto_ops as const

2009-10-07 01:10:46 -07:00

bluetooth

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

2009-10-27 01:03:26 -07:00

bridge

bridge: Allow enable/disable UFO on bridge device via ethtool

2009-10-07 22:00:24 -07:00

can

net: Generalize socket rx gap / receive queue overflow cmsg

2009-10-12 13:26:31 -07:00

core

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

2009-10-27 01:03:26 -07:00

dcb

net: fix double skb free in dcbnl

2009-09-26 20:16:15 -07:00

dccp

net: Fix for dst_negative_advice

2009-10-20 18:55:46 -07:00

decnet

net: Fix for dst_negative_advice

2009-10-20 18:55:46 -07:00

dsa

netdev: convert pseudo-devices to netdev_tx_t

2009-09-01 01:13:07 -07:00

econet

econet: Fix redeclaration of symbol len

2009-10-07 14:43:04 -07:00

ethernet

net: remove COMPAT_NET_DEV_OPS

2009-05-25 01:53:53 -07:00

ieee802154

net: sk_drops consolidation

2009-10-14 20:40:11 -07:00

ipv4

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

2009-10-27 01:03:26 -07:00

ipv6

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

2009-10-27 01:03:26 -07:00

ipx

net: mark net_proto_ops as const

2009-10-07 01:10:46 -07:00

irda

net: mark net_proto_ops as const

2009-10-07 01:10:46 -07:00

iucv

af_iucv: remove duplicate sock_set_flag

2009-10-17 23:57:20 -07:00

key

net: Generalize socket rx gap / receive queue overflow cmsg

2009-10-12 13:26:31 -07:00

lapb

net: remove NET_RX_BAD and NET_RX_CN* defines

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

llc

net: mark net_proto_ops as const

2009-10-07 01:10:46 -07:00

mac80211

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

2009-10-13 12:55:20 -07:00

netfilter

inet: rename some inet_sock fields

2009-10-18 18:52:53 -07:00

netlabel

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

2009-07-30 19:22:43 -07:00

netlink

genetlink: Optimize and one bug fix in genl_generate_id()

2009-10-17 23:57:26 -07:00

netrom

net: mark net_proto_ops as const

2009-10-07 01:10:46 -07:00

packet

vlan: allow null VLAN ID to be used

2009-10-27 01:02:33 -07:00

phonet

Phonet: hold socket before giving it to sk_deliver_skb()

2009-10-15 12:30:42 -07:00

rds

inet: rename some inet_sock fields

2009-10-18 18:52:53 -07:00

rfkill

headers: remove sched.h from poll.h

2009-10-04 15:05:10 -07:00

rose

net: mark net_proto_ops as const

2009-10-07 01:10:46 -07:00

rxrpc

net: Generalize socket rx gap / receive queue overflow cmsg

2009-10-12 13:26:31 -07:00

sched

pkt_sched: skbedit add support for setting mark

2009-10-22 21:56:42 -07:00

sctp

inet: rename some inet_sock fields

2009-10-18 18:52:53 -07:00

sunrpc

inet: rename some inet_sock fields

2009-10-18 18:52:53 -07:00

tipc

net: Make setsockopt() optlen be unsigned.

2009-09-30 16:12:20 -07:00

unix

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

2009-10-27 01:03:26 -07:00

wanrouter

headers: smp_lock.h redux

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

wimax

wimax: fix warning caused by not checking retval of rfkill_set_hw_state()

2009-06-11 11:12:48 -07:00

wireless

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

2009-10-11 23:15:47 -07:00

x25

x25: bit and/or confusion in x25_ioctl()?

2009-10-13 03:44:07 -07:00

xfrm

xfrm: remove skb_icv_walk

2009-10-18 21:32:01 -07:00

compat.c

net: Introduce recvmmsg socket syscall

2009-10-12 23:40:10 -07:00

Kconfig

net/compat/wext: send different messages to compat tasks

2009-07-15 08:53:39 -07:00

Makefile

net: remove redundant sched/ in net/Makefile

2009-07-12 20:11:14 -07:00

nonet.c

…

socket.c

net: Introduce recvmmsg socket syscall

2009-10-12 23:40:10 -07:00

sysctl_net.c

net: sysctl_net - use net_eq to compare nets

2009-03-16 16:23:30 +01:00

TUNABLE

…