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

Conflicts:
	net/mac80211/main.c

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

..

9p

net/9p/trans_fd.c: Fix unsigned return type

2010-09-06 18:48:42 -07:00

802

…

8021q

vlan: Use vlan_dev_real_dev in vlan_hwaccel_do_receive

2010-08-31 13:37:05 -07:00

appletalk

…

atm

atm: remove a net_device_stats clear

2010-08-19 00:14: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: poll() optimizations

2010-09-06 18:48:45 -07:00

bridge

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

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

caif

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

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

can

net: simplify flags for tx timestamping

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

core

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

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

dcb

…

dccp

dccp ccid-3: use per-route RTO or TCP RTO as fallback

2010-08-30 13:45:28 -07:00

decnet

net/decnet: Adjust confusing if indentation

2010-08-16 21:06:30 -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

econet: kill unnecessary spin_lock_init()

2010-08-28 15:37:03 -07:00

ethernet

net: use scnprintf() to avoid potential buffer overflow

2010-08-26 14:11:49 -07:00

ieee802154

…

ipv4

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

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

ipv6

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

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

ipx

…

irda

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

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

iucv

…

key

…

l2tp

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

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

lapb

…

llc

…

mac80211

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

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

netfilter

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

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

netlabel

…

netlink

netlink: Make NETLINK_USERSOCK work again.

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

netrom

…

packet

net: simplify flags for tx timestamping

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

phonet

Phonet: do not set POLLOUT in case of send buffer overflow

2010-08-31 13:04:33 -07:00

rds

RDS: Implement masked atomic operations

2010-09-08 18:16:51 -07:00

rfkill

…

rose

net/rose: Use GFP_ATOMIC

2010-08-01 00:32:12 -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-09-09 22:27:33 -07:00

sctp

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

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

sunrpc

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

2010-08-18 15:45:23 -07:00

tipc

tipc: Optimize handling excess content on incoming messages

2010-09-09 21:34:14 -07:00

unix

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

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

wanrouter

net: autoconvert trivial BKL users to private mutex

2010-07-12 20:21:47 -07:00

wimax

…

wireless

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

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

x25

…

xfrm

xfrm_user: avoid a warning with some compiler

2010-09-01 14:29:35 -07:00

compat.c

…

Kconfig

DNS: Separate out CIFS DNS Resolver code

2010-08-05 17:17:51 +00: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

…

TUNABLE

…