diff options
author | David S. Miller <davem@davemloft.net> | 2017-05-27 02:46:35 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-05-27 02:46:35 +0200 |
commit | 34aa83c2fc23e055968387c8b78ac8bafd735aff (patch) | |
tree | a53a341d74613e512bf467ea12615f509cb53536 /kernel/utsname_sysctl.c | |
parent | Merge branch 'ibmvnic-Driver-updates' (diff) | |
parent | Merge tag 'led_fixes_for_4-12-rc3' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
download | linux-34aa83c2fc23e055968387c8b78ac8bafd735aff.tar.xz linux-34aa83c2fc23e055968387c8b78ac8bafd735aff.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Overlapping changes in drivers/net/phy/marvell.c, bug fix in 'net'
restricting a HW workaround alongside cleanups in 'net-next'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel/utsname_sysctl.c')
0 files changed, 0 insertions, 0 deletions