Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

This commit is contained in:
Christian Schmidt
2010-02-11 19:13:36 +01:00
40 changed files with 14365 additions and 7 deletions

View File

@@ -3,5 +3,9 @@ lib/modules/2.6.27.42-ipfire/kernel/net
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