summaryrefslogtreecommitdiff
path: root/net/l2tp/l2tp_eth.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-09-29 12:44:34 -0700
committerMark Brown <broonie@kernel.org>2016-09-29 12:44:34 -0700
commitd053c2b9b2193cbcba58d21ca15a50f6cd17a5c1 (patch)
tree5ad57a3a81b8e92336fe241aecffd56025e72f42 /net/l2tp/l2tp_eth.c
parent971dec826c211c8fef4ed5b6db2cb048873a020b (diff)
parent05f9033f74798aa27569ad7866b952ff51f83c26 (diff)
parent3a6f9dce6116cc54e31dc10d176ceecb1a7e4e7f (diff)
parent51a576400ea46fec0df1672b373de91b00aa4a30 (diff)
Merge remote-tracking branches 'asoc/topic/qcom', 'asoc/topic/rockchip' and 'asoc/topic/rt5616' into asoc-next