]> 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: f31f795 df50ba0)
Merge branch 'kernel-update' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 5 Jul 2010 00:04:08 +0000 (02:04 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 5 Jul 2010 00:04:08 +0000 (02:04 +0200)

Trivial merge
IPFire 3.x development tree