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

Conflicts:
	drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
	drivers/net/wireless/iwlwifi/pcie/tx.c

2012-11-21 12:57:56 -05:00

..

9p

The following changes since commit 4cbe5a555fa58a79b6ecbb6c531b8bab0650778d:

2012-10-12 09:59:23 +09:00

802

…

8021q

vlan: don't deliver frames for unknown vlans to protocols

2012-10-08 15:21:55 -04:00

appletalk

userns: Print out socket uids in a user namespace aware fashion.

2012-08-14 21:48:06 -07:00

atm

net🏧fix up ENOIOCTLCMD error handling

2012-08-31 16:14:33 -04:00

ax25

userns: Convert net/ax25 to use kuid_t where appropriate

2012-08-14 21:49:42 -07:00

batman-adv

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

2012-09-28 14:40:49 -04:00

bluetooth

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

2012-11-21 12:57:56 -05:00

bridge

bridge: Pull ip header into skb->data before looking into ip header.

2012-10-10 22:50:45 -04:00

caif

caif: move the dereference below the NULL test

2012-09-10 16:13:31 -04:00

can

sections: fix section conflicts in net/can

2012-10-06 03:04:45 +09:00

ceph

Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

2012-10-14 13:39:34 -07:00

core

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211

2012-11-19 14:37:43 -05:00

dcb

netlink: Rename pid to portid to avoid confusion

2012-09-10 15:30:41 -04:00

dccp

dccp: fix info leak via getsockopt(DCCP_SOCKOPT_CCID_TX_INFO)

2012-08-15 21:36:31 -07:00

decnet

sections: fix section conflicts in net

2012-10-06 03:04:45 +09:00

dns_resolver

Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

2012-10-14 13:39:34 -07:00

dsa

workqueue: deprecate flush[_delayed]_work_sync()

2012-08-20 14:51:24 -07:00

ethernet

…

ieee802154

net/ieee802154/6lowpan.c: Remove unecessary semicolon

2012-09-18 16:08:19 -04:00

ipv4

vti: fix sparse bit endian warnings

2012-10-12 13:56:52 -04:00

ipv6

tcp: resets are misrouted

2012-10-12 13:52:40 -04:00

ipx

userns: Print out socket uids in a user namespace aware fashion.

2012-08-14 21:48:06 -07:00

irda

silence some noisy printks in irda

2012-10-04 15:53:48 -04:00

iucv

…

key

net/key/af_key.c: add range checks on ->sadb_x_policy_len

2012-10-01 17:15:06 -04:00

l2tp

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

2012-09-28 14:40:49 -04:00

lapb

…

llc

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

2012-10-02 11:11:09 -07:00

mac80211

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

2012-11-21 12:57:56 -05:00

mac802154

…

netfilter

ipvs: fix ARP resolving for direct routing mode

2012-10-08 17:42:36 -04:00

netlabel

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

2012-10-02 13:38:27 -07:00

netlink

netlink: add reference of module in netlink_dump_start

2012-10-07 00:30:56 -04:00

netrom

net: change return values from -EACCES to -EPERM

2012-09-21 13:58:08 -04:00

nfc

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

2012-11-21 12:57:56 -05:00

openvswitch

net/openvswitch/vport.c: Remove unecessary semicolon

2012-09-18 16:08:19 -04:00

packet

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

2012-10-02 11:11:09 -07:00

phonet

netlink: Rename pid to portid to avoid confusion

2012-09-10 15:30:41 -04:00

rds

RDS: fix rds-ping spinlock recursion

2012-10-09 13:57:23 -04:00

rfkill

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

2012-10-02 13:38:27 -07:00

rose

…

rxrpc

Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

2012-10-14 13:39:34 -07:00

sched

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

2012-10-02 13:38:27 -07:00

sctp

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

2012-10-06 03:11:59 +09:00

sunrpc

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

2012-10-13 10:53:54 +09:00

tipc

tipc: prevent dropped connections due to rcvbuf overflow

2012-10-04 15:53:48 -04:00

unix

af_unix: old_cred is surplus

2012-09-17 13:00:13 -04:00

wanrouter

…

wimax

…

wireless

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

2012-11-21 12:57:56 -05:00

x25

…

xfrm

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

2012-10-02 13:38:27 -07:00

compat.c

make get_file() return its argument

2012-09-26 21:10:25 -04:00

Kconfig

net: Add INET dependency on aes crypto for the sake of TCP fastopen.

2012-09-04 14:20:14 -04:00

Makefile

…

nonet.c

…

socket.c

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

2012-10-02 20:25:04 -07:00

sysctl_net.c

…