Merge branch 'master' into next

diff --combined lfs/linux
index 8a6e7e44e586c80ce71a9450a975a6352b458a74,5d27158f06662b5ce454d3a981f58b7f13a3a210..8c22914aa6fc285ba79e750458c4e15f776a719c
--- 1/lfs/linux
--- 2/lfs/linux
+++ b/lfs/linux
@@@ -24,8 -24,8 +24,8 @@@
  
  include Config
  
 -PATCHLEVEL = .15
 -VER        = 2.6.32.15
 +PATCHLEVEL = .17
 +VER        = 2.6.32.17
  
  THISAPP    = linux-$(VER)
  DL_FILE    = $(THISAPP).tar.bz2
@@@ -57,21 -57,21 +57,21 @@@ objects =$(DL_FILE) 
        patch-2.6.16-nath323-1.3.bz2 \
        reiser4-for-2.6.32.patch.bz2 \
        squashfs-lzma-linux-2.6.32-kernel-patches.tar.bz2 \
 -      xen-patches-2.6.32-2.tar.bz2
 +      xen-patches-2.6.32-2a.tar.bz2
  
  $(DL_FILE)                            = $(URL_IPFIRE)/$(DL_FILE)
  netfilter-layer7-v2.22.tar.gz         = $(URL_IPFIRE)/netfilter-layer7-v2.22.tar.gz
  patch-2.6.16-nath323-1.3.bz2          = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2
  reiser4-for-2.6.32.patch.bz2          = $(URL_IPFIRE)/reiser4-for-2.6.32.patch.bz2
  squashfs-lzma-linux-2.6.32-kernel-patches.tar.bz2 = $(URL_IPFIRE)/squashfs-lzma-linux-2.6.32-kernel-patches.tar.bz2
 -xen-patches-2.6.32-2.tar.bz2          = $(URL_IPFIRE)/xen-patches-2.6.32-2.tar.bz2
 +xen-patches-2.6.32-2a.tar.bz2         = $(URL_IPFIRE)/xen-patches-2.6.32-2a.tar.bz2
  
 -$(DL_FILE)_MD5                                = 1cbbf16e93bbe03368172872690600c0
 +$(DL_FILE)_MD5                                = 33e4f0d69e5d4cb0c1bb2357b27a05be
  netfilter-layer7-v2.22.tar.gz_MD5     = 98dff8a3d5a31885b73341633f69501f
  patch-2.6.16-nath323-1.3.bz2_MD5      = f926409ff703a307baf54b57ab75d138
  reiser4-for-2.6.32.patch.bz2_MD5      = 3246397973d9271eb8e6d7c97c5d2d91
  squashfs-lzma-linux-2.6.32-kernel-patches.tar.bz2_MD5 = d2a84311081023c7ffd28cdca67c45d4
 -xen-patches-2.6.32-2.tar.bz2_MD5      = d1d78d2e9b9b62dd869a490f4415de04
 +xen-patches-2.6.32-2.tar.bz2_MD5      = bccb78b9712cb538c6ddadff1dae0ddc
  
  install : $(TARGET)
  
@@@ -109,7 -109,7 +109,7 @@@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(
  ifeq "$(XEN)" "1"
        # Apply gentoo Xen patches
        mkdir -p $(DIR_SRC)/xen-patches
 -      cd $(DIR_SRC)/xen-patches && tar jxf $(DIR_DL)/xen-patches-2.6.32-2.tar.bz2
 +      cd $(DIR_SRC)/xen-patches && tar jxf $(DIR_DL)/xen-patches-2.6.32-2a.tar.bz2
  
        for x in `ls -1 $(DIR_SRC)/xen-patches/*.patch1`; do \
                echo "*********** [Patch: $$x]"; \
@@@ -147,6 -147,9 +147,9 @@@ endi
        # Huawei (Vodafone) K3765 & K4505 Usbids
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.11-option_add_vodafone_usbids.patch
  
+       # Huawei Android Phones (Vodafone V845, T-Mobile Pulse/mini ...)
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.15-option_add_huawei_android.patch
+ 
        # Cleanup kernel source
  
        cp $(DIR_SRC)/config/kernel/kernel.config.$(MACHINE)-$(VERSUFIX) $(DIR_APP)/.config

diff --combined make.sh
index a00832c2781f7b2d8bc196ed78e35126c0654f39,a7cda0919aad22b8b24d51df98ceb8b76cb590b2..aaf90b2bbf4ce955263713738cb821fcc6d24fe9
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -373,7 -373,9 +373,7 @@@ buildipfire() 
    ipfiremake pkg-config
    ipfiremake linux-atm
    ipfiremake cpio
 -  ipfiremake klibc
 -  ipfiremake mkinitcpio
 -  ipfiremake udev                     KLIBC=1
 +  ipfiremake dracut
    ipfiremake expat
    ipfiremake gdbm
    ipfiremake gmp
@@@ -680,8 -682,6 +680,6 @@@ buildinstaller() 
    installmake popt
    installmake sysvinit
    installmake misc-progs
-   installmake libaal
-   installmake reiser4progs
    installmake reiserfsprogs
    installmake sysfsutils
    installmake util-linux