]> 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: 2b29c22 a2f2c8d)
Merge branch 'kernel-update' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 23 Aug 2009 06:04:12 +0000 (08:04 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 23 Aug 2009 06:04:12 +0000 (08:04 +0200)

Trivial merge
Timo's tree of IPFire 2.x