| commit | 690abf19d3ca57d8619c228898ae485027502052 | [log] [tgz] |
|---|---|---|
| author | Simon Horman <horms+renesas@verge.net.au> | Wed Mar 27 13:18:35 2013 +0900 |
| committer | Simon Horman <horms+renesas@verge.net.au> | Wed Mar 27 13:18:35 2013 +0900 |
| tree | 4e21391d49f836faf72673313f4fc07b67e926a7 | |
| parent | 39d143bc33bb425ac6809a9832f1bb2234678307 [diff] | |
| parent | efab148d33cfcc8c575974225f594efb1f00d6a9 [diff] |
Merge branch 'backport/ltsi-3.4.25/a15-base-3' into backport/ltsi-3.4.25/h2-base-4 Conflicts: arch/arm/mach-shmobile/intc-r8a7779.c arch/arm/mach-shmobile/platsmp.c arch/arm/mach-shmobile/smp-sh73a0.c drivers/irqchip/Kconfig drivers/irqchip/Makefile