| commit | 1999a8f1204f993bf1ca6a5fcec8cbbc94e1428e | [log] [tgz] |
|---|---|---|
| author | Bob Copeland <me@bobcopeland.com> | Wed Apr 03 11:13:14 2019 -0400 |
| committer | Bob Copeland <me@bobcopeland.com> | Wed Apr 03 11:13:14 2019 -0400 |
| tree | c0adb8f38bcdad945ad28c36b55694e0e2491a9b | |
| parent | 79a3aaa7b82e3106be97842dedfd8429248896e6 [diff] | |
| parent | 3eed52842b9fd291233c15f65fed34c5d3241183 [diff] |
Merge remote-tracking branch 'net-next/master' # Conflicts: # drivers/staging/mt7621-eth/mtk_eth_soc.c