]> 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: 0020d1a 597e1ee)
Merge branch 'kernel-3.14'
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 28 Apr 2014 11:33:22 +0000 (13:33 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 28 Apr 2014 11:33:22 +0000 (13:33 +0200)

Trivial merge
IPFire 3.x development tree