Merge remote-tracking branch 'ms/arm-freescale' into fifteen
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 28 Aug 2013 09:14:17 +0000 (11:14 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 28 Aug 2013 09:14:17 +0000 (11:14 +0200)
commit80759d65f4a14e69b80b2afa9336c92991390b4b
tree1a750e0bb3db1f65902ababe9737fbceec33af86
parentfc621876dc2a994ab5b1d3aeef8c55e6430b511e
parentddc492dd30283a3108d1436f849abedad345d6b5
Merge remote-tracking branch 'ms/arm-freescale' into fifteen

Conflicts:
make.sh
make.sh