You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

David S. Miller 45ce829dd0 Merge tag 'master-2014-09-04' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless ... John W. Linville says: ==================== pull request: wireless 2014-09-05 Please pull this batch of fixes intended for the 3.17 stream... For the mac80211 bits, Johannes says: "Here are a few fixes for mac80211. One has been discussed for a while and adds a terminating NUL-byte to the alpha2 sent to userspace, which shouldn't be necessary but since many places treat it as a string we couldn't move to just sending two bytes. In addition to that, we have two VLAN fixes from Felix, a mesh fix, a fix for the recently introduced RX aggregation offload, a revert for a broken patch (that luckily didn't really cause any harm) and a small fix for alignment in debugfs." For the iwlwifi bits, Emmanuel says: "I revert a patch that disabled CTS to self in dvm because users reported issues. The revert is CCed to stable since the offending patch was sent to stable too. I also bump the firmware API versions since a new firmware is coming up. On top of that, Marcel fixes a bug I introduced while fixing a bug in our Kconfig file." Please let me know if there are problems! ==================== Signed-off-by: David S. Miller <davem@davemloft.net>		11 years ago
..
appletalk	…
arcnet	PCI changes for the v3.17 merge window (part 2):	11 years ago
bonding	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	11 years ago
caif	net: set name_assign_type in alloc_netdev()	11 years ago
can	can: flexcan: handle state passive -> warning transition	11 years ago
cris	eth_v10: remove unnecessary break after return	11 years ago
dsa	…
ethernet	amd-xgbe: Enable interrupts for all management counters	11 years ago
fddi	drivers/net/fddi/skfp/h/skfbi.h: Remove useless PCI_BASE_2ND macros	11 years ago
hamradio	net: set name_assign_type in alloc_netdev()	11 years ago
hippi	PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use	11 years ago
hyperv	hyperv: Adjust the size of sendbuf region to support ws2008r2	11 years ago
ieee802154	net: set name_assign_type in alloc_netdev()	11 years ago
irda	PCI changes for the v3.17 merge window (part 2):	11 years ago
phy	phy: fix EEE checks inside the phy_init_eee.	11 years ago
plip	…
ppp	net: filter: split 'struct sk_filter' into socket and bpf parts	11 years ago
slip	net: set name_assign_type in alloc_netdev()	11 years ago
team	team: Simplify return path of team_newlink	11 years ago
usb	net: fix USB network driver config option.	11 years ago
vmxnet3	VMXNET3: Check for map error in vmxnet3_set_mc	11 years ago
wan	PCI changes for the v3.17 merge window (part 2):	11 years ago
wimax	net: set name_assign_type in alloc_netdev()	11 years ago
wireless	Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes	11 years ago
xen-netback	xen-netback: move netif_napi_add before binding interrupt	11 years ago
Kconfig	vxlan: Call udp_sock_create	11 years ago
LICENSE.SRC	…
Makefile	net: reduce USB network driver config options.	11 years ago
Space.c	…
dummy.c	net: set name_assign_type in alloc_netdev()	11 years ago
eql.c	net: set name_assign_type in alloc_netdev()	11 years ago
ifb.c	net: set name_assign_type in alloc_netdev()	11 years ago
loopback.c	net: set name_assign_type in alloc_netdev()	11 years ago
macvlan.c	macvlan: Allow setting multicast filter on all macvlan types	11 years ago
macvtap.c	…
mdio.c	…
mii.c	…
netconsole.c	…
nlmon.c	…
ntb_netdev.c	…
rionet.c	…
sb1000.c	…
sungem_phy.c	…
tun.c	net: set name_assign_type in alloc_netdev()	11 years ago
veth.c	net: rtnetlink - make create_link take name_assign_type	11 years ago
virtio_net.c	virtio-net: rx busy polling support	11 years ago
vxlan.c	vxlan: fix incorrect initializer in union vxlan_addr	11 years ago
xen-netfront.c	xen-netfront: Fix handling packets on compound pages with skb_linearize	11 years ago