David S. Miller 1f6d80358d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	arch/mips/net/bpf_jit.c
	drivers/net/can/flexcan.c

Both the flexcan and MIPS bpf_jit conflicts were cases of simple
overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>

2014-09-23 12:09:27 -04:00

..

6lowpan

…

9p

…

802

…

8021q

net: Always untag vlan-tagged traffic on input.

2014-08-11 12:16:51 -07:00

appletalk

…

atm

atm: Convert pr_warning to pr_warn

2014-09-10 12:40:10 -07:00

ax25

…

batman-adv

batman-adv: Fix parameter order of hlist_add_behind

2014-08-16 19:19:08 -07:00

bluetooth

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

2014-09-08 11:14:56 -04:00

bridge

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

2014-09-23 12:09:27 -04:00

caif

…

can

…

ceph

libceph: do not hard code max auth ticket len

2014-09-10 20:08:36 +04:00

core

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

2014-09-23 12:09:27 -04:00

dcb

…

dccp

…

decnet

af_decnet: Use time_after_eq

2014-08-22 12:23:11 -07:00

dns_resolver

…

dsa

net: dsa: add {get, set}_wol callbacks to slave devices

2014-09-22 14:41:23 -04:00

ethernet

net: Add function for parsing the header length out of linear ethernet frames

2014-09-05 17:47:02 -07:00

hsr

…

ieee802154

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

2014-09-08 11:14:56 -04:00

ipv4

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

2014-09-23 12:09:27 -04:00

ipv6

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

2014-09-23 12:09:27 -04:00

ipx

…

irda

irda: Fix rd_frame control field initialization in irlap_send_rd_frame()

2014-08-13 20:05:52 -07:00

iucv

iucv: Convert pr_warning to pr_warn

2014-09-10 12:40:10 -07:00

key

…

l2tp

l2tp: Refactor l2tp core driver to make use of the common UDP tunnel functions

2014-09-19 15:57:15 -04:00

lapb

…

llc

…

mac80211

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

2014-09-23 12:09:27 -04:00

mac802154

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

2014-09-08 11:14:56 -04:00

mpls

…

netfilter

Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next

2014-09-10 12:46:32 -07:00

netlabel

…

netlink

netlink: Annotate RCU locking for seq_file walker

2014-08-14 15:13:40 -07:00

netrom

…

nfc

…

openvswitch

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

2014-09-23 12:09:27 -04:00

packet

net: Pass a "more" indication down into netdev_start_xmit() code paths.

2014-09-01 17:39:55 -07:00

phonet

…

rds

…

rfkill

net: rfkill: gpio: Enable module auto-loading for ACPI based switches

2014-09-16 16:09:01 -04:00

rose

rose: use %*ph specifier

2014-09-07 16:07:25 -07:00

rxrpc

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

2014-09-23 12:09:27 -04:00

sched

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

2014-09-23 12:09:27 -04:00

sctp

net/ipv4: bind ip_nonlocal_bind to current netns

2014-09-09 11:27:09 -07:00

sunrpc

NFS client updates for Linux 3.17

2014-08-13 18:13:19 -06:00

tipc

tipc: fix sparse warnings

2014-09-10 14:00:58 -07:00

unix

…

vmw_vsock

…

wimax

…

wireless

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

2014-09-23 12:09:27 -04:00

x25

…

xfrm

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

2014-09-23 12:09:27 -04:00

compat.c

…

Kconfig

…

Makefile

…

nonet.c

…

socket.c

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

2014-09-23 12:09:27 -04:00

sysctl_net.c

…