From: Christian Schmidt Date: Thu, 11 Feb 2010 18:13:36 +0000 (+0100) Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-2.x X-Git-Tag: v2.9-beta1~463 X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=fc558271507c47ac73eaa2a2d1643cb8281fbe91 Merge branch 'master' of git://git.ipfire.org/ipfire-2.x --- fc558271507c47ac73eaa2a2d1643cb8281fbe91 diff --cc config/rootfiles/core/37/filelists/files index 5ef91c8ab4,1e46cb98f7..024bd72160 --- a/config/rootfiles/core/37/filelists/files +++ b/config/rootfiles/core/37/filelists/files @@@ -3,5 -3,8 +3,9 @@@ lib/modules/2.6.27.42-ipfire/kernel/ne lib/modules/2.6.27.42-ipfire-xen/kernel/net lib/modules/2.6.27.42-ipfire/mISDN/hfcsusb.ko lib/modules/2.6.27.42-ipfire-xen/mISDN/hfcsusb.ko + lib/modules/2.6.27.42-ipfire/kernel/drivers/hwmon/coretemp.ko + 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 srv/web/ipfire/cgi-bin/urlfilter.cgi +srv/web/ipfire/cgi-bin/outgoingfw.cgi