Merge tag 'fixes-for-v4.0-rc5' of https://github.com/rjarzmik/linux into fixes
authorOlof Johansson <olof@lixom.net>
Sun, 29 Mar 2015 20:47:21 +0000 (13:47 -0700)
committerOlof Johansson <olof@lixom.net>
Sun, 29 Mar 2015 20:47:37 +0000 (13:47 -0700)
commit53b1a66398ac59d294bc26498b7d65dd44b758bb
tree934f3e24304fb05edc82f43767039fbd1070cf16
parent3034b0082e22755909bdb5be2a1536fa2cf10f56
parentd6cf30ca716b347587b35923eda400ad2d9e8832
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>