summaryrefslogtreecommitdiffstats
path: root/include/net/xfrm.h
diff options
context:
space:
mode:
authorMark Brown2016-12-12 16:53:32 +0100
committerMark Brown2016-12-12 16:53:32 +0100
commita5de5b74a50113564a1e0850e2da96c37c35e55d (patch)
tree518def9fdc525e1a8331edcea06e8630b3e9910f /include/net/xfrm.h
parentMerge remote-tracking branches 'asoc/topic/wm8580', 'asoc/topic/wm8753', 'aso... (diff)
parentASoC: wm9712: Remove unused DAI ID defines (diff)
parentASoC: wm9713: Remove unused DAI ID defines (diff)
parentASoC: zte: spdif: correct ZX_SPDIF_CLK_RAT define (diff)
downloadkernel-qcow2-linux-a5de5b74a50113564a1e0850e2da96c37c35e55d.tar.gz
kernel-qcow2-linux-a5de5b74a50113564a1e0850e2da96c37c35e55d.tar.xz
kernel-qcow2-linux-a5de5b74a50113564a1e0850e2da96c37c35e55d.zip
Merge remote-tracking branches 'asoc/topic/wm9712', 'asoc/topic/wm9713' and 'asoc/topic/zte' into asoc-next