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

Browse source

Minor SPDX change conflict.

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

...

This commit is contained in:

David S. Miller 2019-06-22 08:59:24 -04:00

parent e0effb5fbd c356dc4b54

commit 92ad6325cb

5301 changed files with 7190 additions and 26605 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

5

include/uapi/linux/psp-sev.h

View file

5

include/uapi/linux/wmi.h

View file