]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 11ec647 b587a27)
Merge branch 'next' into kernel-4.9
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 11 Jul 2017 15:44:42 +0000 (17:44 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 11 Jul 2017 15:44:42 +0000 (17:44 +0200)

Trivial merge
Peter's tree of IPFire 2.x