]> 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: 08e3292 38bb1dd)
Merge branch 'kernel-update' of ssh://git.ipfire.org/pub/git/ipfire-2.x into kernel...
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 20 Aug 2012 16:29:53 +0000 (12:29 -0400)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 20 Aug 2012 16:29:53 +0000 (12:29 -0400)

Trivial merge
Peter's tree of IPFire 2.x