John W. Linville c96e96354a Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem ...

Conflicts:
	net/bluetooth/Makefile

2011-01-05 16:06:25 -05:00

..

9p

net/9p/protocol.c: Remove duplicated macros.

2010-12-08 09:56:28 -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

net: kill unused macros

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

ax25

…

batman-adv

batman-adv: Return hna count on local buffer fill

2010-12-20 10:32:03 -08: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

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

2011-01-04 11:57:25 -08:00

caif

Net: caif: Makefile: Remove deprecated items

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

can

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

2011-01-04 11:57:25 -08:00

ceph

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

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

core

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

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

dcb

dcbnl: more informed return values for new dcbnl routines

2011-01-03 12:12:11 -08:00

dccp

dccp: remove unused macros

2010-12-10 12:49:23 +01:00

decnet

net: Abstract default MTU metric calculation behind an accessor.

2010-12-14 13:01:14 -08:00

dns_resolver

Net: dns_resolver: Makefile: Remove deprecated kbuild goal definitions

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

dsa

…

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

…

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-04 11:57:25 -08:00

ipv6

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

2010-12-20 13:24:14 -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

…

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

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

2011-01-05 16:06:25 -05:00

netfilter

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

2010-11-19 13:13:47 -08:00

netlabel

net: kill unused macros

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

netlink

…

netrom

…

packet

net: Use skb_checksum_start_offset()

2010-12-16 14:43:14 -08:00

phonet

Net: phonet: Makefile: Remove deprecated kbuild goal definitions

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

rds

Net: rds: Makefile: Remove deprecated items

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

rfkill

rfkill: remove dead code

2010-11-15 13:24:06 -05:00

rose

…

rxrpc

Net: rxrpc: Makefile: Remove deprecated kbuild goal definitions

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

sched

sch_red: report backlog information

2011-01-03 12:13:15 -08:00

sctp

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

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

sunrpc

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

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

tipc

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

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

unix

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

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

wanrouter

Net: wanrouter: Makefile: Remove deprecated kbuild goal definitions

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

wimax

…

wireless

cfg80211: fix transposition of words in printk

2011-01-04 14:43:01 -05: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

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

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

compat.c

…

Kconfig

net: Add batman-adv meshing protocol

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

Makefile

net: Add batman-adv meshing protocol

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

nonet.c

…

socket.c

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

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

sysctl_net.c

…

TUNABLE

…