diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-07-09 11:43:49 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-07-09 11:43:49 +0300 |
| commit | 52e31f89cc40c613b22e62108fe12b27433a888e (patch) | |
| tree | c3cd45d6950706c32efdd341715e70b6ee6d7a5e /include/uapi/linux/if_tun.h | |
| parent | 9a7e7b571826c4399aa639af4a670642d96d935c (diff) | |
| parent | ee40fb2948fc99096836995d4f3ddcc0efbac790 (diff) | |
| download | linux-52e31f89cc40c613b22e62108fe12b27433a888e.tar.xz | |
Merge branch 'linus' into x86/asm, to pick up fixes before merging new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/uapi/linux/if_tun.h')
0 files changed, 0 insertions, 0 deletions