summaryrefslogtreecommitdiff
path: root/net/l2tp
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-09-16 16:20:19 -0700
committerMark Brown <broonie@kernel.org>2014-09-16 16:20:19 -0700
commit94b0955ddd1ea4ea1089a282dd8058765fffe937 (patch)
tree8adc4f5d165b677bde453cbc80a621a3e5b67bbd /net/l2tp
parent9e82bf014195d6f0054982c463575cdce24292be (diff)
parent6e7488f8f6f68218bd52283f78f571466280ac96 (diff)
parenta97c883a16da7e0691a3be5465926c92a8da4da6 (diff)
parentd9f26748128c73ec6bed2846ca52fb1c2edc3ced (diff)
parent61e89e65e31516cae8124599e43be955eb10514c (diff)
parent6e3be9bbeaa841eb65fa7570e0c542b2c1483fca (diff)
parent810a58b0256b24f194dda5ca1e705204ca703f7b (diff)
Merge remote-tracking branches 'spi/fix/davinci', 'spi/fix/dw', 'spi/fix/fsl', 'spi/fix/pl022', 'spi/fix/rockchip' and 'spi/fix/sirf' into spi-linus