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

Browse source

Conflicts:
	net/dsa/slave.c

net/dsa/slave.c simply had overlapping changes.

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

...

This commit is contained in:

David S. Miller 2015-10-02 07:21:25 -07:00

parent 2dc6a0303b 36f8dafe52

commit f6d3125fa3

240 changed files with 2429 additions and 1379 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/userfaultfd.h

View file