diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-06-05 07:35:52 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-06-05 07:35:52 -0400 |
| commit | 1fb333489fb917c704ad43e51b45c12f52215a9c (patch) | |
| tree | 03c1aa24c1bed4ec01d9c68e4ca0619aa31d3571 /net/8021q/vlan_dev.c | |
| parent | 20e7e364331d7b5590695a839a18a00547403f18 (diff) | |
| parent | 3f8517e7937d04ac7df9082c741fefc9c873065b (diff) | |
| parent | 8ef418c7178fa611d84e187bacb967880f6f5b69 (diff) | |
| parent | 1c2f87c22566cd057bc8cde10c37ae9da1a1bb76 (diff) | |
Merge branches 'alignment', 'fixes', 'l2c' (early part) and 'misc' into for-next