diff options
| author | Mark Brown <broonie@kernel.org> | 2016-05-13 14:23:08 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-05-13 14:23:08 +0100 |
| commit | 8595bb27cebe8b823167fd11b2b506f2e59e83f5 (patch) | |
| tree | 7786a67238a96830b5586d407aa720c3310b5f48 /net/l2tp/Makefile | |
| parent | ab3688541d72cae7570840c7e3c7770b35adc0ba (diff) | |
| parent | 1a4d5a3e2caacd104e82ebd3c4964e681de1aa8a (diff) | |
| parent | c5c9c2df4d97e20cd4e05c848dc8ceff926d162f (diff) | |
| parent | 162c5a368fb788f040e9c51a1251ac36d80bff32 (diff) | |
| parent | f2e6721af4466f1a53f16ccb8f1df57b3a0cd18e (diff) | |
Merge remote-tracking branches 'regulator/topic/abb', 'regulator/topic/act8865', 'regulator/topic/as3722' and 'regulator/topic/axp20x' into regulator-next