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

Conflicts:
	net/bluetooth/l2cap_core.c

2011-07-15 10:05:24 -04:00

..

9p

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband

2011-05-26 12:13:57 -07:00

802

snap: remove one synchronize_net()

2011-05-23 16:29:24 -04:00

8021q

net: vlan: remove reduntant check in ndo_fix_features callback

2011-07-14 14:39:29 -07:00

appletalk

appletalk: Reduce switch/case indent

2011-07-01 16:11:15 -07:00

atm

net: Remove casts of void *

2011-06-16 23:19:27 -04:00

ax25

…

batman-adv

netdevice: Kill 'feature' test macros.

2011-07-12 12:28:58 -07:00

bluetooth

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

2011-07-15 10:05:24 -04:00

bridge

net: Embed hh_cache inside of struct neighbour.

2011-07-14 07:53:20 -07:00

caif

Remove redundant linux/version.h includes from net/

2011-06-21 16:03:17 -07:00

can

net/can: use printk_ratelimited() instead of printk_ratelimit()

2011-06-17 00:03:03 -04:00

ceph

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

2011-07-14 07:56:40 -07:00

core

net: remove /sys/class/net/*/features

2011-07-14 14:45:15 -07:00

dcb

dcbnl: unlock on an error path in dcbnl_cee_fill()

2011-07-08 09:01:14 -07:00

dccp

dccp ccid-2: Perform congestion-window validation

2011-07-04 12:37:49 -06:00

decnet

decnet: Reduce switch/case indent

2011-07-01 16:11:15 -07:00

dns_resolver

…

dsa

DSA: Enable cascading in multi-chip 6131 configuration

2011-06-29 05:53:49 -07:00

econet

af_econet: Use current logging styles and neatening

2011-07-03 20:05:16 -07:00

ethernet

net: Push protocol type directly down to header_ops->cache()

2011-07-13 02:29:59 -07:00

ieee802154

ieee802154: free skb buffer if dev isn't running

2011-06-30 16:18:09 +04:00

ipv4

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

2011-07-14 07:56:40 -07:00

ipv6

net: Embed hh_cache inside of struct neighbour.

2011-07-14 07:53:20 -07:00

ipx

…

irda

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

2011-06-20 22:29:08 -07:00

iucv

[S390] irq: merge irq.c and s390_ext.c

2011-05-26 09:48:24 +02:00

key

net: Remove casts of void *

2011-06-16 23:19:27 -04:00

l2tp

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

2011-06-20 22:29:08 -07:00

lapb

lapb: Reduce switch/case indent

2011-07-01 16:11:16 -07:00

llc

…

mac80211

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

2011-07-14 07:56:40 -07:00

netfilter

netfilter: Reduce switch/case indent

2011-07-01 16:11:15 -07:00

netlabel

net: Remove casts of void *

2011-06-16 23:19:27 -04:00

netlink

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

2011-06-24 15:25:51 -04:00

netrom

netrom: Reduce switch/case indent

2011-07-01 16:11:16 -07:00

nfc

NFC: add the NFC socket raw protocol

2011-07-05 15:26:58 -04:00

packet

af-packet: fix - avoid reading stale data

2011-07-14 08:36:33 -07:00

phonet

rtnetlink: Compute and store minimum ifinfo dump size

2011-06-09 20:38:07 -07:00

rds

net: rds: fix const array syntax

2011-07-01 16:16:19 -07:00

rfkill

net: rfkill: add generic gpio rfkill driver

2011-05-19 13:53:54 -04:00

rose

rose: Delete commented out references to ancient firewalling code.

2011-07-07 02:41:59 -07:00

rxrpc

rxrpc: Fix set but unused variable 'usage' in rxrpc_get_transport()

2011-05-19 18:51:50 -04:00

sched

net: remove SK_ROUTE_CAPS from meta ematch

2011-07-14 14:45:59 -07:00

sctp

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

2011-07-14 07:56:40 -07:00

sunrpc

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

2011-07-14 07:56:40 -07:00

tipc

tipc: Optimize creation of connection protocol messages

2011-06-24 16:18:18 -04:00

unix

net: convert %p usage to %pK

2011-05-24 01:13:12 -04:00

wanrouter

…

wimax

…

wireless

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

2011-07-14 07:56:40 -07:00

x25

x25: Reduce switch/case indent

2011-07-01 16:11:16 -07:00

xfrm

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

2011-07-14 07:56:40 -07:00

compat.c

…

Kconfig

NFC: add nfc subsystem core

2011-07-05 15:26:57 -04:00

Makefile

NFC: add nfc subsystem core

2011-07-05 15:26:57 -04:00

nonet.c

…

socket.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

2011-05-20 13:43:21 -07:00

sysctl_net.c

…