tree 2290013d78edd149839a462903c7aa02598a8cb1
parent 1ddda1cd235e05961bada337f87494272701c189
parent d9621176872319a568d9892701410bcbfbd5b35c
author Olof Johansson <olof@lixom.net> 1357353908 -0800
committer Olof Johansson <olof@lixom.net> 1357621706 -0800

Merge tag 'nomadik-fixes-for-arm-soc' of git://git.kernel.org/pub/scm/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