From: Kevin Hilman <khilman@linaro.org>
Date: Tue, 15 Dec 2015 00:59:40 +0000 (-0800)
Subject: Merge tag 'sunxi-fixes-for-4.4' of https://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: firefly_0821_release~176^2~482^2~12
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8fcacc0344e6d49c8305a146ca4c62a9a654adaa;p=firefly-linux-kernel-4.4.55.git

Merge tag 'sunxi-fixes-for-4.4' of https://git./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
---

8fcacc0344e6d49c8305a146ca4c62a9a654adaa