diff options
| author | Takashi Iwai <tiwai@suse.de> | 2020-01-26 09:31:34 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2020-01-26 09:31:41 +0100 |
| commit | 9b132f2764e5a04bfb2e6c6f51cf5a729617d6a4 (patch) | |
| tree | 986201af09ea4cd734ac5afa4a069cb9e56b78e9 /tools/testing/selftests/net/pmtu.sh | |
| parent | 5396c4bd9fd8429050f6191663b6c491e6402da2 (diff) | |
| parent | b81cbf7abfc94878a3c6f0789f2185ee55b1cc21 (diff) | |
Merge branch 'for-linus' into for-next
Resolve conflicts and correct the hex numbers, too.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'tools/testing/selftests/net/pmtu.sh')
0 files changed, 0 insertions, 0 deletions