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

@@@ -7,7 -7,4 +7,7 @@@ lib/modules/2.6.27.42-ipfire/kernel/dri
  lib/modules/2.6.27.42-ipfire-xen/kernel/drivers/hwmon/coretemp.ko
  lib/modules/2.6.27.42-ipfire/kernel/drivers/net/et131x.ko
  lib/modules/2.6.27.42-ipfire-xen/kernel/drivers/net/et131x.ko
 +lib/modules/2.6.27.42-ipfire/kernel/arch/x86/kernel/cpu/cpufreq/p4-clockmod.ko
 +lib/modules/2.6.27.42-ipfire-xen/kernel/arch/x86/kernel/cpu/cpufreq/p4-clockmod.ko
  srv/web/ipfire/cgi-bin/urlfilter.cgi
 +srv/web/ipfire/cgi-bin/outgoingfw.cgi