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

Conflicts:
	net/sched/sch_hfsc.c
	net/sched/sch_htb.c
	net/sched/sch_tbf.c

2011-01-24 14:09:35 -08:00

..

9p

net: cleanup unused macros in net directory

2011-01-19 23:20:04 -08:00

802

…

8021q

8021q: vlan device is lockless do not transfer real_num_{tx|rx}_queues

2010-11-28 10:47:19 -08:00

appletalk

…

atm

Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq

2011-01-07 16:58:04 -08:00

ax25

net: ax25: fix information leak to userland harder

2011-01-12 00:34:49 -08:00

batman-adv

batman-adv: Use "__attribute__" shortcut macros

2011-01-16 03:25:19 +01:00

bluetooth

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

2011-01-04 14:25:28 -05:00

bridge

netfilter: ebt_ip6: allow matching on ipv6-icmp types/codes

2011-01-13 12:05:12 +01:00

caif

net: cleanup unused macros in net directory

2011-01-19 23:20:04 -08:00

can

can: test size of struct sockaddr in sendmsg

2011-01-15 20:56:42 -08:00

ceph

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client

2011-01-13 10:25:24 -08:00

core

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

2011-01-24 14:09:35 -08:00

dcb

dcb: use after free in dcb_flushapp()

2011-01-06 11:16:54 -08:00

dccp

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2011-01-13 10:05:56 -08:00

decnet

net: cleanup unused macros in net directory

2011-01-19 23:20:04 -08:00

dns_resolver

Net: dns_resolver: Makefile: Remove deprecated kbuild goal definitions

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

dsa

module: fix missing semicolons in MODULE macro usage

2011-01-24 14:32:54 +10:30

econet

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

2010-12-17 12:27:22 -08:00

ethernet

eth: fix new kernel-doc warning

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

ieee802154

net: RCU conversion of dev_getbyhwaddr() and arp_ioctl()

2010-12-08 10:07:24 -08:00

ipv4

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

2011-01-24 14:09:35 -08:00

ipv6

ipv6: raw: rcu annotations

2011-01-20 16:59:34 -08:00

ipx

…

irda

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

2010-12-26 22:37:05 -08:00

iucv

[S390] irq: have detailed statistics for interrupt types

2011-01-05 12:47:25 +01:00

key

…

l2tp

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

2010-12-08 13:47:38 -08:00

lapb

Net: lapb: Makefile: Remove deprecated kbuild goal definitions

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

llc

net: RCU conversion of dev_getbyhwaddr() and arp_ioctl()

2010-12-08 10:07:24 -08:00

mac80211

kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT

2011-01-20 17:02:05 -08:00

netfilter

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

2011-01-24 14:09:35 -08:00

netlabel

net: kill unused macros

2010-12-19 21:59:35 -08:00

netlink

Revert "netlink: test for all flags of the NLM_F_DUMP composite"

2011-01-19 13:34:20 -08:00

netrom

…

packet

net: cleanup unused macros in net directory

2011-01-19 23:20:04 -08:00

phonet

phonet: some signedness bugs

2011-01-10 13:33:17 -08:00

rds

net: cleanup unused macros in net directory

2011-01-19 23:20:04 -08:00

rfkill

kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT

2011-01-20 17:02:05 -08:00

rose

…

rxrpc

rxrpc: rxrpc_workqueue isn't used during memory reclaim

2011-01-14 09:25:11 -08:00

sched

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

2011-01-24 14:09:35 -08:00

sctp

sctp: user perfect name for Delayed SACK Timer option

2011-01-19 16:51:29 -08:00

sunrpc

Merge branch 'for-2.6.38' of git://linux-nfs.org/~bfields/linux

2011-01-14 13:17:26 -08:00

tipc

tipc: update log.h re-include protection to reflect new name

2011-01-01 14:56:18 -08:00

unix

af_unix: coding style: remove one level of indentation in unix_shutdown()

2011-01-19 23:31:11 -08:00

wanrouter

net: cleanup unused macros in net directory

2011-01-19 23:20:04 -08:00

wimax

…

wireless

kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT

2011-01-20 17:02:05 -08:00

x25

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

2010-12-08 13:47:38 -08:00

xfrm

Revert "netlink: test for all flags of the NLM_F_DUMP composite"

2011-01-19 13:34:20 -08:00

compat.c

…

Kconfig

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2011-01-13 10:05:56 -08:00

Makefile

net: Add batman-adv meshing protocol

2010-12-16 13:44:24 -08:00

nonet.c

…

socket.c

pass default dentry_operations to mount_pseudo()

2011-01-12 20:03:43 -05:00

sysctl_net.c

…

TUNABLE

…