John W. Linville 7eab0f64a9 Merge branch 'master' into for-davem ...

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-testmode.c
	net/wireless/nl80211.c

2012-04-12 14:41:59 -04:00

..

9p

net/9p: handle flushed Tclunk/Tremove

2012-02-26 14:49:57 -06:00

802

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

2012-04-02 17:53:39 -07:00

8021q

vlan: Stop using NLA_PUT*().

2012-04-02 04:33:44 -04:00

appletalk

net: remove k{un}map_skb_frag()

2012-04-05 05:36:43 -04:00

atm

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

ax25

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

batman-adv

batman-adv: add bridge loop avoidance compile option

2012-04-11 14:29:00 +02:00

bluetooth

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth

2012-04-09 15:47:49 -04:00

bridge

bridge: Stop using NLA_PUT*().

2012-04-02 04:33:44 -04:00

caif

caif: Stop using NLA_PUT*().

2012-04-02 04:33:44 -04:00

can

…

ceph

libceph: isolate kmap() call in write_partial_msg_pages()

2012-03-22 10:47:52 -05:00

core

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

2012-04-10 14:30:45 -04:00

dcb

net/dcb: Add an optional max rate attribute

2012-04-05 05:08:04 -04:00

dccp

dccp: fix bug in sequence number validation during connection setup

2012-03-03 09:02:52 -07:00

decnet

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

2012-04-10 14:30:45 -04:00

dns_resolver

KEYS: Allow special keyrings to be cleared

2012-01-19 14:38:51 +11:00

dsa

dsa: Move switch drivers to new directory drivers/net/dsa

2011-11-29 00:21:36 -05:00

econet

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

ethernet

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

ieee802154

ieee802154: Stop using NLA_PUT*().

2012-04-02 04:33:43 -04:00

ipv4

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

2012-04-10 14:30:45 -04:00

ipv6

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

2012-04-10 14:30:45 -04:00

ipx

…

irda

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

iucv

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

2012-03-22 18:15:32 -07:00

key

net: use IS_ENABLED(CONFIG_IPV6)

2011-12-11 18:25:16 -05:00

l2tp

l2tp: Stop using NLA_PUT*().

2012-04-02 04:33:41 -04:00

lapb

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

llc

llc: Fix race condition in llc_ui_recvmsg

2012-01-24 15:33:19 -05:00

mac80211

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

2012-04-12 13:49:28 -04:00

netfilter

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

2012-04-10 14:30:45 -04:00

netlabel

netlabel: use GFP flags from caller instead of GFP_ATOMIC

2012-03-22 19:29:57 -04:00

netlink

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

2012-04-10 14:30:45 -04:00

netrom

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

nfc

Merge branch 'master' into for-davem

2012-04-12 14:41:59 -04:00

openvswitch

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

2012-04-10 14:30:45 -04:00

packet

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

phonet

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

2012-04-10 14:30:45 -04:00

rds

RDS: use gfp flags from caller in conn_alloc()

2012-03-22 19:29:58 -04:00

rfkill

device.h: cleanup users outside of linux/include (C files)

2012-03-11 14:27:37 -04:00

rose

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

2012-04-02 17:53:39 -07:00

rxrpc

RxRPC: Fix kcalloc parameters swapped

2012-02-14 14:41:55 -05:00

sched

pkt_sched: Stop using NLA_PUT*().

2012-04-01 18:11:37 -04:00

sctp

sctp: Allow struct sctp_event_subscribe to grow without breaking binaries

2012-04-04 18:05:02 -04:00

sunrpc

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

2012-03-29 14:53:25 -07:00

tipc

tipc: Optimize setting of immutable payload message header fields

2012-02-29 11:45:35 -05:00

unix

af_unix: reduce high order page allocations

2012-04-03 16:43:18 -04:00

wanrouter

…

wimax

…

wireless

Merge branch 'master' into for-davem

2012-04-12 14:41:59 -04:00

x25

net:x25: use IS_ENABLED

2011-12-16 15:49:52 -05:00

xfrm

xfrm_user: Stop using NLA_PUT*().

2012-04-01 18:11:36 -04:00

compat.c

Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2012-03-29 18:12:23 -07:00

Kconfig

net: Add Open vSwitch kernel components.

2011-12-03 09:35:17 -08:00

Makefile

net: Add Open vSwitch kernel components.

2011-12-03 09:35:17 -08:00

nonet.c

…

socket.c

tcp: tcp_sendpages() should call tcp_push() once

2012-04-05 19:04:27 -04:00

sysctl_net.c

sysctl: Modify __register_sysctl_paths to take a set instead of a root and an nsproxy

2012-01-24 16:40:30 -08:00