From: Olof Johansson <olof@lixom.net>
Date: Sun, 29 Mar 2015 20:47:21 +0000 (-0700)
Subject: Merge tag 'fixes-for-v4.0-rc5' of https://github.com/rjarzmik/linux into fixes
X-Git-Tag: firefly_0821_release~176^2~2084^2~4
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=53b1a66398ac59d294bc26498b7d65dd44b758bb;p=firefly-linux-kernel-4.4.55.git

Merge tag 'fixes-for-v4.0-rc5' of https://github.com/rjarzmik/linux into fixes

arm: pxa: fixes for v4.0-rc5

There are only 2 fixes, one for the zeus board about the regulator changes,
where a typo prevented the zeus board from having a working can regulator,
and one regression triggered by the interrupts IRQ shift of 16 affecting all
boards.

* tag 'fixes-for-v4.0-rc5' of https://github.com/rjarzmik/linux:
  ARM: pxa: fix pxa interrupts handling in DT
  ARM: pxa: Fix typo in zeus.c

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

53b1a66398ac59d294bc26498b7d65dd44b758bb