Merge tag 'nomadik-fixes-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel...
authorOlof Johansson <olof@lixom.net>
Sat, 5 Jan 2013 02:45:08 +0000 (18:45 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 8 Jan 2013 05:08:26 +0000 (21:08 -0800)
commitdaaeec936fe43f7f3f15e61e1da86f1fa1c37e3e
tree2290013d78edd149839a462903c7aa02598a8cb1
parent1ddda1cd235e05961bada337f87494272701c189
parentd9621176872319a568d9892701410bcbfbd5b35c
Merge tag 'nomadik-fixes-for-arm-soc' of git://git./linux/kernel/git/linusw/linux-nomadik into fixes

From Linus Walleij:
Two fixes to the Nomadik:
- Delete a dangling include
- Bump IRQ numbers to offset at 32

* tag 'nomadik-fixes-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
  ARM: nomadik: bump the IRQ numbers again
  ARM: nomadik: delete dangling include