]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
projects / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a6b1508 1986cc8)
Merge branch 'dma' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 25 Aug 2015 12:57:40 +0000 (13:57 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 25 Aug 2015 12:57:40 +0000 (13:57 +0100)

Trivial merge
IPFire 2.x development tree