summaryrefslogtreecommitdiff
path: root/net/ipv4/inet_diag.c
diff options
context:
space:
mode:
authorKevin Hilman <khilman@linaro.org>2015-12-15 00:59:40 (GMT)
committerKevin Hilman <khilman@linaro.org>2015-12-15 00:59:40 (GMT)
commit8fcacc0344e6d49c8305a146ca4c62a9a654adaa (patch)
tree43fdca5c5f33e28a25d8dc335e59d282fd540bad /net/ipv4/inet_diag.c
parent7f4c977849d494a1ff173fbc226b69192ec02c90 (diff)
parent43675ffafd3c3373f82691f539df3dc7403877fe (diff)
downloadlinux-8fcacc0344e6d49c8305a146ca4c62a9a654adaa.tar.xz
Merge tag 'sunxi-fixes-for-4.4' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into fixes
Merge "Allwinner fixes for 4.4" from Maxime Ripard: Allwinner fixes for 4.4 Two patches, one to fix the touchscreen axis on one Allwinner board, and the other one fixing a mutex unlocking issue on one error path in the RSB driver. * tag 'sunxi-fixes-for-4.4' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux: bus: sunxi-rsb: unlock on error in sunxi_rsb_read() ARM: dts: sunxi: sun6i-a31s-primo81.dts: add touchscreen axis swapping property
Diffstat (limited to 'net/ipv4/inet_diag.c')
0 files changed, 0 insertions, 0 deletions