]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
Merge branch 'kernel2.6.32.8' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 14 Feb 2010 10:33:02 +0000 (11:33 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 14 Feb 2010 10:33:02 +0000 (11:33 +0100)
Conflicts:
doc/packages-list.txt
lfs/linux

1  2 
config/rootfiles/oldcore/37/filelists/files