]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
Merge branch 'kernel-update'
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 17 Jan 2011 12:33:13 +0000 (13:33 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 17 Jan 2011 12:33:13 +0000 (13:33 +0100)

Trivial merge