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

Conflicts:
	drivers/net/wireless/ath/ath9k/main.c
	net/bluetooth/hci_event.c

2012-06-13 15:35:35 -04:00

..

9p

Autogenerated GPG tag for Rusty D1ADB8F1: 15EE 8D6C AB0E 7F0C F999 BFCB D920 0E6C D1AD B8F1

2012-05-21 20:20:23 -07:00

802

…

8021q

…

appletalk

…

atm

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

2012-05-22 19:22:50 -07:00

ax25

…

batman-adv

…

bluetooth

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

2012-06-13 15:35:35 -04:00

bridge

ipv6: correct the ipv6 option name - Pad0 to Pad1

2012-05-17 15:49:51 -04:00

caif

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

2012-05-22 19:22:50 -07:00

can

…

ceph

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client

2012-05-30 11:17:19 -07:00

core

wireless: remove wext sysfs

2012-06-05 15:32:15 -04:00

dcb

…

dccp

…

decnet

…

dns_resolver

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

2012-05-21 20:27:36 -07:00

dsa

…

ethernet

…

ieee802154

…

ipv4

tcp: reflect SYN queue_mapping into SYNACK packets

2012-06-01 14:22:11 -04:00

ipv6

tcp: reflect SYN queue_mapping into SYNACK packets

2012-06-01 14:22:11 -04:00

ipx

ipx: Remove spurious NULL checking in ipx_ioctl().

2012-05-19 00:51:04 -04:00

irda

…

iucv

…

key

…

l2tp

genetlink: Build a generic netlink family module alias

2012-05-29 22:33:56 -04:00

lapb

lapb: Neaten debugging

2012-05-17 18:45:20 -04:00

llc

…

mac80211

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

2012-06-13 15:35:35 -04:00

mac802154

…

netfilter

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

2012-05-22 17:37:47 -07:00

netlabel

…

netlink

genetlink: Build a generic netlink family module alias

2012-05-29 22:33:56 -04:00

netrom

…

nfc

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

2012-06-12 14:11:13 -04:00

openvswitch

…

packet

…

phonet

…

rds

rds_rdma: don't assume infiniband device is PCI

2012-05-29 17:30:07 -04:00

rfkill

rfkill: Add the capability to switch all devices of all type in __rfkill_switch_all().

2012-06-06 15:18:17 -04:00

rose

…

rxrpc

…

sched

sch_atm.c: get rid of poinless extern

2012-06-01 10:37:18 -04:00

sctp

…

sunrpc

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

2012-06-01 08:32:58 -07:00

tipc

…

unix

…

wanrouter

net/wanrouter: Deprecate and schedule for removal

2012-05-24 16:22:53 -04:00

wimax

…

wireless

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

2012-06-13 15:35:35 -04:00

x25

…

xfrm

ipv6: fix incorrect ipsec fragment

2012-05-27 01:11:22 -04:00

compat.c

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

2012-05-21 20:27:36 -07:00

Kconfig

net: drop NET dependency from HAVE_BPF_JIT

2012-05-21 12:50:12 -07:00

Makefile

econet: remove ancient bug ridden protocol

2012-05-18 01:35:08 -04:00

nonet.c

…

socket.c

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

2012-05-22 17:37:47 -07:00

sysctl_net.c

…