]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commitdiff
projects / people / teissler / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 36900a8 fef20da)
Merge branch 'kernel-update' of git.ipfire.org:/pub/git/ipfire-2.x into kernel-update
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 14 May 2012 15:12:27 +0000 (17:12 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 14 May 2012 15:12:27 +0000 (17:12 +0200)

Trivial merge
Timo's tree of IPFire 2.x