Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
authorChristian Schmidt <maniacikarus@ipfire.org>
Thu, 11 Feb 2010 18:13:36 +0000 (19:13 +0100)
committerChristian Schmidt <maniacikarus@ipfire.org>
Thu, 11 Feb 2010 18:13:36 +0000 (19:13 +0100)
1  2 
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