| commit | 39ee32d45fa601c2eb73f8c8c63c6f443cf720ed | [log] [tgz] |
|---|---|---|
| author | Marc Zyngier <marc.zyngier@arm.com> | Sun Dec 29 10:44:47 2013 +0000 |
| committer | Marc Zyngier <marc.zyngier@arm.com> | Sun Dec 29 10:44:47 2013 +0000 |
| tree | d6ae28b651b9488304be940f902abf05771807ac | |
| parent | fef24f4f38eb685a6da29097930e6e49b378f8fb [diff] | |
| parent | 25ae46bbbd3d127d0476d5b66a4595f0b3479b69 [diff] |
Merge remote-tracking branch 'sunxi/sunxi' into sunxi-merge Conflicts: arch/arm/cpu/armv7/Makefile