diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2018-01-25 22:17:06 +0100 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2018-01-25 22:17:06 +0100 |
commit | ea4d340cbea470247b19ee696e31f102bc64466a (patch) | |
tree | 48f241ec80e720857a97f017f5ab49110c7456db /arch/mips | |
parent | 0c5b9b5d9adbad4b60491f9ba0d2af38904bb4b9 (diff) | |
parent | 39fe477ba9397c27e0b060455bfd9799ee992045 (diff) | |
parent | dbb3aa2939a702a6cdaa666c3652e3e8d3146858 (diff) | |
download | linux-next-ea4d340cbea470247b19ee696e31f102bc64466a.tar.gz |
Merge branches '4.15-fixes', '4.16-features' and 'octeon-3-net-mips-bits' into mips-next