]> git.ipfire.org Git - people/ms/ipfire-3.x.git/commitdiff
projects / people / ms / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1f9bc2f 11ca4f2)
Merge remote-tracking branch 'ms/u-boot'
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 11 Dec 2011 10:14:05 +0000 (11:14 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 11 Dec 2011 10:14:05 +0000 (11:14 +0100)

Trivial merge
Michael's tree of IPFire 3.x.