diff options
| author | Mark Brown <broonie@kernel.org> | 2014-10-10 13:00:02 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-10-10 13:00:02 +0100 |
| commit | 51e809ee973d95a49753d554753e1c65a507b0b2 (patch) | |
| tree | c3ebca0d1706b73ae11907d2d1e5112250f80cd8 /include/linux/if_vlan.h | |
| parent | 472a0079c08c9e92489940d3a1527508a5beeeec (diff) | |
| parent | 42108afdd3ce3010ed1e7ff613cc97d024807e99 (diff) | |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-android
Diffstat (limited to 'include/linux/if_vlan.h')
0 files changed, 0 insertions, 0 deletions