summaryrefslogtreecommitdiff
path: root/net/rose/rose_timer.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2021-07-01 11:51:36 -0700
committerDavid S. Miller <davem@davemloft.net>2021-07-01 11:51:36 -0700
commit5e437416ff66981d8154687cfdf7de50b1d82bfc (patch)
treeff4e4b52f0cd44326c720f8a6c535c7552556d2b /net/rose/rose_timer.c
parentb71d09871566a20ae8a1064e50f1e94813b18482 (diff)
parent953b0dcbe2e3f7bee98cc3bca2ec82c8298e9c16 (diff)
Merge branch 'dsa-mv88e6xxx-topaz-fixes'
Marek BehĂșn says: ==================== dsa: mv88e6xxx: Topaz fixes here comes some fixes for the Topaz family (Marvell 88E6141 / 88E6341) which I found out about when I compared the Topaz' operations structure with that one of Peridot (6390). This is v2. In v1, I accidentally sent patches generated from wrong branch and the 5th patch does not contain a necessary change in serdes.c. Changes from v1: - the fifth patch, "enable SerDes RX stats for Topaz", needs another change in serdes.c - Andrew's Reviewed-by to 1,2,3,4 and 6 ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/rose/rose_timer.c')
0 files changed, 0 insertions, 0 deletions