diff options
| author | Mark Brown <broonie@linaro.org> | 2014-08-04 16:32:01 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-08-04 16:32:01 +0100 |
| commit | c1bd940afdba6d8d6a0a2219cf6ae9dafc7ef0a9 (patch) | |
| tree | d76f4a4b76d38fc2ea05fd4497225c1e1d29a0fb /net/l2tp/l2tp_ppp.c | |
| parent | b0ae27c477b19d1da015e6ace0a5707d4173ff8b (diff) | |
| parent | 019575726e6d93933ed6823475d09b932be2a5fc (diff) | |
| parent | f18803a3758a55feb376490a76c351ab40c3cf03 (diff) | |
| parent | 1bb60b3a5ae526287fc6d0c55391f5664cc1e672 (diff) | |
| parent | 71864b22f50ceab0025ae2a1cd81b956878ded2b (diff) | |
| parent | 9f98cd69c1517e05aa00ab843f054457cc3488c1 (diff) | |
Merge remote-tracking branches 'asoc/topic/rt5670', 'asoc/topic/rt5677', 'asoc/topic/s6000', 'asoc/topic/samsung' and 'asoc/topic/sh-fsi' into asoc-next