]> 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: 68ad7a1 141c7c9)
Merge branch 'kernel-update' of git.ipfire.org:/pub/git/ipfire-2.x into kernel-update
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 21 Jul 2012 21:54:01 +0000 (23:54 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 21 Jul 2012 21:54:01 +0000 (23:54 +0200)

Trivial merge
Peter's tree of IPFire 2.x