Merge commit 'origin/master' into next

diff --combined lfs/mISDN
index 349f260fb9f597640da2d1ed95bb94825f8734d1,01bd77d7d433f95aedbe4020796b278a4f7794dd..8eec207819a077c801b469c78ce83cc2d1837535
--- 1/lfs/mISDN
--- 2/lfs/mISDN
+++ b/lfs/mISDN
@@@ -24,15 -24,11 +24,15 @@@
  
  include Config
  
 +ifeq "$(PAE)" "1"
 +      VERSUFIX=ipfire-pae
 +else
  ifeq "$(XEN)" "1"
        VERSUFIX=ipfire-xen
  else
        VERSUFIX=ipfire
  endif
 +endif
  
  VER        = 20100525
  
@@@ -81,6 -77,7 +81,7 @@@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(
        @$(PREBUILD)
        @rm -rf $(DIR_SRC)/mISDN* && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_SRC)/mISDN && patch -Np1 < $(DIR_SRC)/src/patches/mISDN-hfcusb-reportl1down.patch
+       cd $(DIR_SRC)/mISDN && patch -Np1 < $(DIR_SRC)/src/patches/mISDN_hfc-s_add_id.patch
        cd $(DIR_SRC)/mISDN && ./configure --with-kerneldir=/usr/src/linux
        cd $(DIR_SRC)/mISDN && make KVERS=$(KVER)-$(VERSUFIX) modules
        cd $(DIR_SRC)/mISDN && make KVERS=$(KVER)-$(VERSUFIX) \