Johannes Berg 51217cee3a Merge remote-tracking branch 'wireless-next/master' into HEAD ...

Merge to get the wil6210 changes that a cfg80211 change needs.
A conflict in drivers/net/wireless/ath/ath9k/init.c was just
whitespace changes.

Also fix a semantic conflict due to cw1200 using WoWLAN which
I had modified in my tree.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

2013-06-04 13:02:42 +02:00

..

appletalk

…

arcnet

…

bonding

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

2013-05-01 17:51:54 -07:00

caif

Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

2013-05-02 14:14:04 -07:00

can

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

2013-05-01 14:08:52 -07:00

cris

…

dsa

…

ethernet

Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

2013-05-09 14:34:58 -07:00

fddi

…

hamradio

drivers/net: rename random32() to prandom_u32()

2013-05-07 18:38:27 -07:00

hippi

…

hyperv

hyperv: Fix a compiler warning in netvsc_send()

2013-04-29 14:06:32 -04:00

ieee802154

at86rf230: change irq handling to prevent lockups with edge type irq

2013-04-16 16:34:08 -04:00

irda

net/irda: fix error return code in bfin_sir_open()

2013-05-08 13:13:29 -07:00

phy

Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux

2013-05-09 09:59:16 -07:00

plip

…

ppp

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

2013-05-01 14:08:52 -07:00

slip

…

team

drivers/net: rename random32() to prandom_u32()

2013-05-07 18:38:27 -07:00

usb

sierra_net: keep status interrupt URB active

2013-05-08 13:13:29 -07:00

vmxnet3

net: vlan: add protocol argument to packet tagging functions

2013-04-19 14:46:06 -04:00

wan

…

wimax

…

wireless

Merge remote-tracking branch 'wireless-next/master' into HEAD

2013-06-04 13:02:42 +02:00

xen-netback

xen-netback: better names for thresholds

2013-05-02 16:50:08 -04:00

dummy.c

…

eql.c

…

ifb.c

net: vlan: announce STAG offload capability in some drivers

2013-04-19 14:46:06 -04:00

Kconfig

…

LICENSE.SRC

…

loopback.c

…

macvlan.c

net: vlan: announce STAG offload capability in some drivers

2013-04-19 14:46:06 -04:00

macvtap.c

…

Makefile

…

mdio.c

…

mii.c

…

netconsole.c

…

ntb_netdev.c

…

rionet.c

…

sb1000.c

…

Space.c

…

sungem_phy.c

…

tun.c

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

2013-04-30 03:55:20 -04:00

veth.c

net: vlan: announce STAG offload capability in some drivers

2013-04-19 14:46:06 -04:00

virtio_net.c

Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

2013-05-02 14:14:04 -07:00

vxlan.c

vxlan: do not set SKB_GSO_UDP

2013-04-29 15:27:47 -04:00

xen-netfront.c

xen-netfront: reduce gso_max_size to account for max TCP header

2013-04-22 15:37:01 -04:00