]> 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: 83c883b 5fe5aed)
Merge remote-tracking branch 'origin/kernel-update' into thirteen
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 28 Aug 2012 12:38:21 +0000 (08:38 -0400)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 28 Aug 2012 12:38:21 +0000 (08:38 -0400)

Trivial merge
Peter's tree of IPFire 2.x