projects / people / teissler / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bc259fd f00884a)
Merge remote-tracking branch 'origin/kernel-update' into glibc-update2
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 21 Aug 2012 12:49:24 +0000 (14:49 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 21 Aug 2012 12:49:24 +0000 (14:49 +0200)

Trivial merge
Timo's tree of IPFire 2.x