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

Conflicts:
	drivers/net/pcmcia/pcnet_cs.c
	net/caif/caif_socket.c

2010-10-06 19:39:31 -07:00

..

9p

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

2010-10-06 19:39:31 -07:00

802

net: return operator cleanup

2010-09-23 14:33:39 -07:00

8021q

net: add a core netdev->rx_dropped counter

2010-10-05 14:47:55 -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 neigh: RCU conversion of neigh hash table

2010-10-05 14:54:36 -07:00

ax25

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

2010-09-09 22:27:33 -07:00

bluetooth

net: return operator cleanup

2010-09-23 14:33:39 -07:00

bridge

bridge : Sanitize skb before it enters the IP stack

2010-09-19 12:42:34 -07:00

caif

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

2010-10-06 19:39:31 -07:00

can

net: simplify flags for tx timestamping

2010-08-19 00:08:30 -07:00

core

neigh: RCU conversion of struct neighbour

2010-10-06 18:01:33 -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: return operator cleanup

2010-09-23 14:33:39 -07:00

decnet

net neigh: RCU conversion of neigh hash table

2010-10-05 14:54:36 -07:00

dns_resolver

DNS: If the DNS server returns an error, allow that to be cached [ver #2]

2010-08-11 17:11:28 +00:00

dsa

phylib: available for any speed ethernet

2010-08-11 23:03:50 -07:00

econet

net: return operator cleanup

2010-09-23 14:33:39 -07:00

ethernet

net: return operator cleanup

2010-09-23 14:33:39 -07:00

ieee802154

ieee802154: Fix possible NULL pointer dereference in wpan_phy_alloc

2010-05-23 23:11:07 -07:00

ipv4

fib: RCU conversion of fib_lookup()

2010-10-05 20:39:38 -07:00

ipv6

net neigh: RCU conversion of neigh hash table

2010-10-05 14:54:36 -07: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: return operator cleanup

2010-09-23 14:33:39 -07:00

iucv

net: use __packed annotation

2010-06-03 03:21:52 -07:00

key

net: return operator cleanup

2010-09-23 14:33:39 -07:00

l2tp

net: constify some ppp/pptp structs

2010-09-21 18:04:47 -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/llc: storing negative error codes in unsigned short

2010-09-16 22:38:23 -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-10-01 11:12:36 -04:00

netfilter

ipvs: Use frag walker helper in SCTP proto support.

2010-10-05 00:27:05 -07:00

netlabel

net: Remove unnecessary returns from void function()s

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

netlink

netlink: Make NETLINK_USERSOCK work again.

2010-08-31 09:51:37 -07:00

netrom

net: sk_sleep() helper

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

packet

net: simplify flags for tx timestamping

2010-08-19 00:08:30 -07:00

phonet

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

2010-10-04 11:56:38 -07:00

rds

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

2010-09-27 01:03:03 -07:00

rfkill

net: return operator cleanup

2010-09-23 14:33:39 -07:00

rose

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

2010-09-27 01:03:03 -07:00

rxrpc

Add a dummy printk function for the maintenance of unused printks

2010-08-12 09:51:35 -07:00

sched

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

2010-10-06 19:39:31 -07:00

sctp

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

2010-10-04 11:56:38 -07:00

sunrpc

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

2010-10-06 19:39:31 -07:00

tipc

net: return operator cleanup

2010-09-23 14:33:39 -07:00

unix

AF_UNIX: Implement SO_TIMESTAMP and SO_TIMETAMPNS on Unix sockets

2010-10-05 14:54:36 -07:00

wanrouter

net: autoconvert trivial BKL users to private mutex

2010-07-12 20:21:47 -07: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

2010-10-01 11:12:36 -04:00

x25

X.25 remove bkl in poll

2010-09-22 13:35:51 -07:00

xfrm

xfrm: Allow different selector family in temporary state

2010-09-20 11:11:38 -07:00

compat.c

From abbffa2aa9bd6f8df16d0d0a102af677510d8b9a Mon Sep 17 00:00:00 2001

2010-06-03 20:03:40 -07:00

Kconfig

net: RPS needs to depend upon USE_GENERIC_SMP_HELPERS

2010-09-14 21:42:22 -07:00

Makefile

DNS: Separate out CIFS DNS Resolver code

2010-08-05 17:17:51 +00:00

nonet.c

…

socket.c

net: remove address space warnings in net/socket.c

2010-09-08 13:46:13 -07:00

sysctl_net.c

net: Remove unnecessary returns from void function()s

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

TUNABLE

…