]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
projects / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a7448ac 5e85622)
Merge remote-tracking branch 'ms/kernel-3.3.6'
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 17 May 2012 15:43:01 +0000 (17:43 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 17 May 2012 15:43:01 +0000 (17:43 +0200)

Trivial merge
IPFire 3.x development tree