diff options
author | Olof Johansson <olof@lixom.net> | 2012-11-20 23:18:03 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-11-20 23:18:03 -0800 |
commit | d7460f4a3d75469deb1c6c028961da69608d02d9 (patch) | |
tree | fa8ffc3a9ad930eb6b669e7d34061ab23a0ac6ca /arch/arm/mach-s5pv210 | |
parent | 63cd201e6559142b16dd2af8c911edd491bf6274 (diff) | |
parent | 3042ac5731e6db441dfce85612da4aa3913dab3b (diff) |
Merge branch 'boards3' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards2
From Simon Horman:
* 'boards3' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: mackerel: Add FLCTL IRQ resource
Diffstat (limited to 'arch/arm/mach-s5pv210')
0 files changed, 0 insertions, 0 deletions