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)
commit19a64d9d591f9d188707e86e53bc0c4ed99ac8f0
tree189b0be9a34730f9ea02c1e4bfb2cd0787c00367
parent815acebff7ac578970986ca3f0ff406c92a0e243
parent4da773193414788b52ae14bc246543390faca5ce
Merge branch 'soc-core' of git://git./linux/kernel/git/rafael/renesas into next/soc

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