From: Olof Johansson <olof@lixom.net>
Date: Wed, 24 Feb 2016 08:05:58 +0000 (-0800)
Subject: Merge tag 'imx-fixes-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo... 
X-Git-Tag: v5.15~14146^2~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b223c9f59389a7802c47ea4c6889dccb2f1a1a60;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'imx-fixes-4.5' of git://git./linux/kernel/git/shawnguo/linux into fixes

The i.MX fixes for v4.5:
 - Drop the bogus interrupt-parent from i.MX6 CAAM node, which leads to
   the CAAM IRQs not getting unmasked at the GPC level.

* tag 'imx-fixes-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: dts: imx6: remove bogus interrupt-parent from CAAM node

Signed-off-by: Olof Johansson <olof@lixom.net>
---

b223c9f59389a7802c47ea4c6889dccb2f1a1a60