summaryrefslogtreecommitdiff
path: root/tools/perf/trace/strace
ModeNameSize
d---------groups32logplain
904d0a1f7bcd6 parent60f06fde4cff6f6134decbf09199b5e047bc3355 (diff)parent740117a8e2b0e89c5fd6f1d5bbc12f87c46c80d7 (diff)
Merge branch 'MV88E6390-fixes'
Andrew Lunn says: ==================== MV88E6390 fixes Two patches, which have been posted before. Fix simple issues in the mv88e6390 support. These don't need to go to stable, since the mv88e6390 support in stable is insufficient to be usable. To apply cleanly, these patches rely on "net: dsa: mv88e6xxx: Workaround missing PHY". v2: Added Reviewed-by. Removed a redundant "the" ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat
-rw-r--r--drivers/net/dsa/mv88e6xxx/chip.c12
-rw-r--r--drivers/net/dsa/mv88e6xxx/port.c2
2 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c