git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commit

author	Michael Tremer <michael.tremer@ipfire.org>
	Wed, 28 Aug 2013 09:14:17 +0000 (11:14 +0200)
committer	Michael Tremer <michael.tremer@ipfire.org>
	Wed, 28 Aug 2013 09:14:17 +0000 (11:14 +0200)
commit	80759d65f4a14e69b80b2afa9336c92991390b4b
tree	1a750e0bb3db1f65902ababe9737fbceec33af86	tree \| snapshot
parent	fc621876dc2a994ab5b1d3aeef8c55e6430b511e	commit \| diff
parent	ddc492dd30283a3108d1436f849abedad345d6b5	commit \| diff

Merge remote-tracking branch 'ms/arm-freescale' into fifteen

Conflicts:
make.sh