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

Conflicts:
	drivers/net/bnx2x_main.c

Merge bnx2x bug fixes in by hand... :-/

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

2010-07-27 21:01:35 -07:00

..

9p

9p: strlen() doesn't count the terminator

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

802

…

8021q

vlan_dev: VLAN 0 should be treated as "no vlan tag" (802.1p packet)

2010-07-18 15:38:44 -07:00

appletalk

…

atm

atm/br2684: register notifier event for carrier signal changes.

2010-07-09 00:09:21 -07:00

ax25

net: sk_sleep() helper

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

bluetooth

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

2010-07-20 18:25:24 -07:00

bridge

bridge: Partially disable netpoll support

2010-07-19 23:28:25 -07:00

caif

caif: precedence bug

2010-07-22 14:14:47 -07:00

can

net/can: Use memdup_user

2010-05-31 00:24:11 -07:00

core

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

2010-07-27 21:01:35 -07:00

dcb

…

dccp

net: dccp: fix sign bug

2010-07-18 15:07:14 -07:00

decnet

net-next: remove useless union keyword

2010-06-10 23:31:35 -07:00

dsa

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

2010-07-20 18:25:24 -07:00

econet

econet: fix locking

2010-06-11 18:37:08 -07:00

ethernet

Net: ethernet: pe2.c: fix EXPORT_SYMBOL macro code style issue

2010-07-14 18:27:09 -07:00

ieee802154

ieee802154: Fix possible NULL pointer dereference in wpan_phy_alloc

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

ipv4

net: RTA_MARK addition

2010-07-22 13:46:21 -07:00

ipv6

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

2010-07-27 21:01:35 -07:00

ipx

…

irda

net/irda: Remove unnecessary casts of private_data

2010-07-12 21:13:37 -07:00

iucv

net: use __packed annotation

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

key

pfkey: add severity to printk

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

l2tp

net-next: remove useless union keyword

2010-06-10 23:31:35 -07:00

lapb

…

llc

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

2010-05-12 00:05:35 -07:00

mac80211

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

2010-07-27 21:01:35 -07:00

netfilter

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6

2010-07-02 22:42:06 -07:00

netlabel

net: Remove unnecessary returns from void function()s

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

netlink

genetlink: use genl_register_family_with_ops()

2010-07-26 21:00:10 -07:00

netrom

net: sk_sleep() helper

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

packet

packet_mmap: expose hw packet timestamps to network packet capture utilities

2010-06-02 05:53:56 -07:00

phonet

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

2010-07-20 18:25:24 -07:00

rds

net/rds: Add missing mutex_unlock

2010-05-29 00:18:48 -07:00

rfkill

…

rose

net: sk_sleep() helper

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

rxrpc

net-next: remove useless union keyword

2010-06-10 23:31:35 -07:00

sched

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

2010-07-27 21:01:35 -07:00

sctp

snmp: add align parameter to snmp_mib_init()

2010-06-25 21:33:17 -07:00

sunrpc

sunrpc: fix leak on error on socket xprt setup

2010-05-26 08:43:50 -04:00

tipc

tipc: Reduce footprint by un-inlining tipc_msg_* routines

2010-05-12 23:02:29 -07:00

unix

drop_monitor: convert some kfree_skb call sites to consume_skb

2010-07-20 13:28:05 -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

2010-07-23 14:03:38 -07:00

x25

X25: Remove bkl in sockopts

2010-05-17 17:39:28 -07:00

xfrm

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

2010-07-20 18:25:24 -07:00

compat.c

From abbffa2aa9bd6f8df16d0d0a102af677510d8b9a Mon Sep 17 00:00:00 2001

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

Kconfig

wireless: Make COMPAT_NETLINK_MESSAGES depend upon WEXT_CORE

2010-07-26 13:13:49 -07:00

Makefile

net/Makefile: conditionally descend to wireless and ieee802154

2010-06-29 15:32:43 -07:00

nonet.c

…

socket.c

net: support time stamping in phy devices.

2010-07-18 19:15:26 -07:00

sysctl_net.c

net: Remove unnecessary returns from void function()s

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

TUNABLE

…