]> 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: 69acde2 0245f3b)
Merge branch 'kernel-5.14' of git.ipfire.org:/pub/git/people/arne_f/ipfire-2.x into...
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 14 Apr 2018 16:45:02 +0000 (18:45 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 14 Apr 2018 16:45:02 +0000 (18:45 +0200)

Trivial merge
Peter's tree of IPFire 2.x