summaryrefslogtreecommitdiff
path: root/drivers/net/ethernet/korina.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2019-07-15 19:42:32 +0300
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2019-07-15 19:42:32 +0300
commitecb41832bd2a7a3f8ac93527cec5e51e3827daed (patch)
treea382a3719eca9ac8a22ae7f1715d0bd4843dc8e2 /drivers/net/ethernet/korina.c
parentd38b6cf50a6b911ee46683330f3af17fcceca509 (diff)
parent0ecfebd2b52404ae0c54a878c872bb93363ada36 (diff)
downloadlinux-ecb41832bd2a7a3f8ac93527cec5e51e3827daed.tar.xz
Merge tag 'v5.2' into next
Sync up with mainline to resolve conflicts in iforce driver.
Diffstat (limited to 'drivers/net/ethernet/korina.c')
0 files changed, 0 insertions, 0 deletions