Merge branch 'soc-core' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renes...
authorOlof Johansson <olof@lixom.net>
Sat, 19 May 2012 06:31:29 +0000 (23:31 -0700)
committerOlof Johansson <olof@lixom.net>
Sat, 19 May 2012 06:31:29 +0000 (23:31 -0700)
Repeat pull of soc-core to bring in a bugfix.

* 'soc-core' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas:
  ARM: mach-shmobile: sh73a0: fixup PINT/IRQ16-IRQ31 irq number conflict


Trivial merge