From: Olof Johansson <olof@lixom.net>
Date: Sat, 5 Jan 2013 02:45:08 +0000 (-0800)
Subject: Merge tag 'nomadik-fixes-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.8-rc3~5^2~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=daaeec936fe43f7f3f15e61e1da86f1fa1c37e3e;p=profile%2Fivi%2Fkernel-x86-ivi.git

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
---

daaeec936fe43f7f3f15e61e1da86f1fa1c37e3e