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

Browse source

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>

...

This commit is contained in:

David S. Miller 2014-09-23 12:09:27 -04:00

parent a2aeb02a8e 98f75b8291

commit 1f6d80358d

467 changed files with 4648 additions and 2442 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

include/uapi/linux/Kbuild

View file

1

include/uapi/linux/input.h

View file