summaryrefslogtreecommitdiff
path: root/drivers/net/ethernet/calxeda
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-06-23 13:29:03 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-06-23 13:29:03 +0200
commit90b45399b4418a3542fe096b92840b3bf235e78e (patch)
treea75e3e37503be4fe4c7d718248bd5a844c8705e1 /drivers/net/ethernet/calxeda
parente39956c0d35efc36acbead9fc624a9ffd7d7ab82 (diff)
parent4b972a01a7da614b4796475f933094751a295a2f (diff)
Merge 5.2-rc6 into staging-next
We want the fixes and this resolves a merge issue as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/ethernet/calxeda')
0 files changed, 0 insertions, 0 deletions