tree cd505254e1b2a292754329b0da949f59e8a90986
parent 4138fcc2b49632158c228d05a330c8830beba04b
author Marc Zyngier <marc.zyngier@arm.com> 1392470518 +0000
committer Marc Zyngier <marc.zyngier@arm.com> 1392470688 +0000

fixup! Merge remote-tracking branch 'sunxi/sunxi' into wip/sunxi-merge-140215