]> 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: df43da1 c6e2a6c)
Merge remote-tracking branch 'ms/kernel-3.4'
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 20 Jun 2012 09:49:11 +0000 (11:49 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 20 Jun 2012 09:49:11 +0000 (11:49 +0200)

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