Merge branch 'master' of ssh://peterman@git.ipfire.org/pub/git/ipfire-2.x

config/kernel/kernel.config.i586

@@ -1788,7 +1788,7 @@ CONFIG_MISDN_AVM_FRITZ=y
 CONFIG_MISDN_NETJET=y
 CONFIG_MISDN_HFCPCI=y
 CONFIG_MISDN_HFCMULTI=y
-CONFIG_HFCMULTI_PCIMEM=y
+# CONFIG_HFCMULTI_PCIMEM is not set
 CONFIG_MISDN_HFCUSB=y
 CONFIG_MISDN_HFCMINI=y
 CONFIG_MISDN_XHFC=y

config/rootfiles/common/mISDN

@@ -1,3 +1,5 @@
+etc/rc.d/init.d/mISDN
+usr/bin/isdnbridge
 usr/bin/loadfirm
 usr/bin/mISDNdebugtool
 usr/bin/misdnportinfo

config/rootfiles/core/28/filelists/files

@@ -3,6 +3,7 @@ etc/rc.d/init.d/snort
 etc/ssh/moduli
 etc/ssh/ssh_config
 etc/ssh/sshd_config
+etc/modprobe.d/blacklist
 usr/bin/scp
 usr/bin/sftp
 usr/bin/slogin

config/rootfiles/packages/samba

@@ -70,6 +70,7 @@ usr/lib/samba/vfs/acl_xattr.so
 usr/lib/samba/vfs/audit.so
 usr/lib/samba/vfs/cap.so
 usr/lib/samba/vfs/default_quota.so
+usr/lib/samba/vfs/dirsort.so
 usr/lib/samba/vfs/expand_msdfs.so
 usr/lib/samba/vfs/extd_audit.so
 usr/lib/samba/vfs/fake_perms.so
@@ -154,6 +155,7 @@ usr/sbin/winbindd
 #usr/share/man/man8/vfs_catia.8
 #usr/share/man/man8/vfs_commit.8
 #usr/share/man/man8/vfs_default_quota.8
+#usr/share/man/man8/vfs_dirsort.8
 #usr/share/man/man8/vfs_extd_audit.8
 #usr/share/man/man8/vfs_fake_perms.8
 #usr/share/man/man8/vfs_fileid.8

config/udev/blacklist

@@ -17,3 +17,11 @@ blacklist l3udss1
 blacklist mISDN_capi
 blacklist mISDN_isac
 blacklist hfcsusb
+blacklist hfcpci
+blacklist hfcsmini
+blacklist l1oip
+blacklist mISDN_dsp
+blacklist netjetpci
+blacklist sedlfax
+blacklist w6692pci
+blacklist xhfc