diff options
| author | Joerg Roedel <jroedel@suse.de> | 2016-09-20 13:27:09 +0200 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2016-09-20 13:27:09 +0200 |
| commit | 13a08259187c5cd3f63d98efa159ab42976d85a4 (patch) | |
| tree | 2a5e9b3b0672324faaa31a92cfa7aa87bdec46b0 /include/uapi/linux/if_pppol2tp.h | |
| parent | 09284b9c4a80299b25b913c976dcaced09cc12f4 (diff) | |
| parent | 1c5ebba95b486f1ea0e17d76dd8f6d7f1a8d1e89 (diff) | |
| parent | 423595e89ddf9b657812a33932a5e2ad1bb9dd54 (diff) | |
| parent | 615cca8c0c2245e7e8c1b1986071506807cbfa90 (diff) | |
| parent | b1e2afca635bb01f93ecd8112c265b980f1abc08 (diff) | |
| parent | 6e0a16673c60386361ea37bde4190dd31d7bcd3e (diff) | |
Merge branches 'x86/amd', 'x86/vt-d', 'arm/exynos', 'arm/mediatek', 'arm/renesas' and 'arm/smmu' into next