75 files changed, 193 insertions, 121 deletions
diff --git a/classes/image.bbclass b/classes/image.bbclass
index 312307c831..ca9c9458e1 100644
--- a/classes/image.bbclass
+++ b/classes/image.bbclass
@@ -125,6 +125,17 @@ insert_feed_uris () {
 		# insert new feed-sources
 		echo "src/gz $feed_name $feed_uri" >> ${IMAGE_ROOTFS}/etc/ipkg/${feed_name}-feed.conf
 	done			
+
+	# Allow to use package deploy directory contents as quick devel-testing
+	# feed. This creates individual feed configs for each arch subdir of those
+	# specified as compatible for the current machine.
+	# NOTE: Development-helper feature, NOT a full-fledged feed.
+	if [ -n "${FEED_DEPLOYDIR_BASE_URI}" ]; then
+	    for arch in ${PACKAGE_ARCHS}
+	    do
+		echo "src/gz local-$arch ${FEED_DEPLOYDIR_BASE_URI}/$arch" >> ${IMAGE_ROOTFS}/etc/ipkg/local-$arch-feed.conf
+	    done
+	fi
 }
 
 log_check() {
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 05ad1f3e19..f36ae8c6fe 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -7,7 +7,7 @@
 #@--------------------------------------------------------------------
 
 # The release will the 2007.12
-DISTRO_VERSION = "2007.11RC2"
+DISTRO_VERSION = "2007.11RC2.1"
 DISTRO_REVISION = "51"
 
 require conf/distro/include/sane-srcdates.inc
diff --git a/conf/documentation.conf b/conf/documentation.conf
index 96a292b9d7..6c71bc00c7 100644
--- a/conf/documentation.conf
+++ b/conf/documentation.conf
@@ -103,6 +103,9 @@ PCMCIA_MANAGER[doc] = "Specify which package(s) to install to handle PCMCIA slot
 
 SYSVINIT_ENABLED_GETTYS[doc] = "Specify which VTs should be running a getty, the default is 1"
 
+FEED_URIS[doc] = "List of ipkg feed records to put into generated image."
+FEED_DEPLOYDIR_BASE_URI[doc] = "Allow to serve ipk deploy dir as an adhoc feed (bogofeed). Set to base URL of the dir as exported by HTTP. Set of adhoc feed configs will be generated in image."
+
 # insane bbclass
 QA_LOG[doc] = "Enable logging of QA errors to log.qa_package. Default is not to log."
 
diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf
index 75ffc0d423..cad7d0393c 100644
--- a/conf/machine/h2200.conf
+++ b/conf/machine/h2200.conf
@@ -26,7 +26,8 @@ PCMCIA_MANAGER = "pcmciautils"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
 
-MACHINE_EXTRA_RDEPENDS = "h2200-bootloader udev-hostap-cs-vcc-workaround"
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS = " h2200-bootloader "
+MACHINE_EXTRA_RDEPENDS = " udev-hostap-cs-vcc-workaround "
 MACHINE_EXTRA_RRECOMMENDS = "\
     kernel-module-snd-h2200-audio \
     kernel-module-i2c-pxa \
@@ -39,7 +40,7 @@ EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x4000"
 #
 module_autoload_snd-pcm-oss 	= "snd-pcm-oss"
 module_autoload_snd-mixer-oss = "snd-mixer-oss"
-module_autoload_snd-h2000-audio = "snd-h2000-audio"
+module_autoload_snd-h2200-audio = "snd-h2200-audio"
 
 SERIAL_CONSOLE = "115200 ttyS0 vt100"
 USE_VT = "0"
diff --git a/conf/machine/h5000.conf b/conf/machine/h5000.conf
index 62d3c21450..fcd6cfa0b9 100644
--- a/conf/machine/h5000.conf
+++ b/conf/machine/h5000.conf
@@ -6,7 +6,7 @@
 # Hardware-based properties
 #
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te  h5xxx"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te"
 
 require conf/machine/include/tune-xscale.inc
 
@@ -31,5 +31,9 @@ MACHINE_EXTRA_RRECOMMENDS = " kernel-module-h5400-lcd \
 #
 # Modules autoload and other boot properties
 #
+module_autoload_snd-pcm-oss = "snd-pcm-oss"
+module_autoload_snd-mixer-oss = "snd-mixer-oss"
+module_autoload_g_ether = "g_ether"
+
 SERIAL_CONSOLE = "115200 ttyS0 vt100"
 USE_VT = "0"
diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf
index 1510cf8745..0d3a9bbcf0 100644
--- a/conf/machine/hx4700.conf
+++ b/conf/machine/hx4700.conf
@@ -21,7 +21,7 @@ MACHINE_DISPLAY_WIDTH_PIXELS = "480"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
 MACHINE_DISPLAY_ORIENTATION = "0"
 MACHINE_DISPLAY_PPI = "200"
-MACHINE_FEATURES = "alsa apm bluetooth irda pcmcia screen touchscreen usbgadget wifi vfat"
+MACHINE_FEATURES = "alsa apm bluetooth irda kernel26 pcmcia screen touchscreen usbgadget wifi vfat"
 MACHINE_FEATURES += "iwmmxt"
 
 #
diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh
index 815a529441..fb117d6c11 100755
--- a/contrib/angstrom/build-feeds.sh
+++ b/contrib/angstrom/build-feeds.sh
@@ -32,27 +32,29 @@ do_report_success() {
 	echo "$(date -u +%s) $target $BUILD_MODE $machine" >> autobuilder-feed.log
 }
 
-for machine in ep93xx gumstix-connex gumstix-verdex efika omap5912osk ixp4xxle ixp4xxbe c7x0 poodle tosa akita spitz collie fic-gta01 a780 at91sam9263ek qemuarm h2200 h3900 h4000 poodle tosa hx4700 c7x0 spitz akita collie spitz 
+for machine in ep93xx gumstix-connex gumstix-verdex efika omap5912osk ixp4xxle ixp4xxbe c7x0 poodle tosa akita spitz collie simpad fic-gta01 a780 at91sam9263ek qemuarm h2200 h3900 h4000 hx4700  
 do
         BUILD_MACHINE=$machine
 	BUILD_CLEAN="libtool-cross qmake-native qmake2-native"
-        BUILD_TARGETS="texinfo gcc binutils automake autoconf m4 pkgconfig \
-	               task-proper-tools mc screen \
+        BUILD_TARGETS="texinfo flex bison gcc binutils automake autoconf m4 pkgconfig \
+	               task-proper-tools mc screen emacs \
 	               mono perl python ruby \
 		       gtk+ qt-x11-free qt4-x11-free \
 		       gpe-mini-browser midori minimo openmoko-browser2 webkit-gtklauncher \
 		       samba \
 		       apache2 boa cherokee lighttpd thttpd \
-		       gpe-gallery gpe-scap notecase pidgin \
+		       gpe-gallery gpe-scap notecase \
+		       pidgin irssi \
 		       roadmap-gtk2 gpsdrive navit \
 		       xmms mplayer quasar \
-		       wpa-gui wifi-radar kismet \
+		       wpa-gui wifi-radar kismet aircrack-ng dsniff \
 		       gpe-bluetooth bluez-gnome python-pybluez \
 		       abiword gnumeric evince epdfview gimp \
 		       flite \
 		       ctorrent \
 		       gnuplot octave fftw fftwf fftwl \
 		       gphoto2 gqview imagemagick ufraw \
+		       tzdata \
 		      "
 	do_build
 done
diff --git a/contrib/angstrom/build-release.sh b/contrib/angstrom/build-release.sh
index 6f86cfe728..54c9fb4fa4 100755
--- a/contrib/angstrom/build-release.sh
+++ b/contrib/angstrom/build-release.sh
@@ -69,7 +69,7 @@ do
 done  
 
 # graphics, flash storage
-for machine in fic-gta01 a780 at91sam9263ek qemuarm h2200 h3900 h4000 poodle tosa hx4700 c7x0 spitz akita collie 
+for machine in fic-gta01 a780 at91sam9263ek qemuarm h2200 h3900 h4000 poodle tosa hx4700 c7x0 spitz akita collie simpad 
 do
 	BUILD_CLEAN="base-files"
 	BUILD_MACHINE=$machine
diff --git a/contrib/mtn2cl/mtn2cl.sh b/contrib/mtn2cl/mtn2cl.sh
index 416d393ccd..15d2722a8b 100755
--- a/contrib/mtn2cl/mtn2cl.sh
+++ b/contrib/mtn2cl/mtn2cl.sh
@@ -11,7 +11,7 @@ else
     export OLD_REV="l:\"1 week ago\""
 fi
 
-for i in `mtn log --brief --no-graph --no-merges --to ${OLD_REV} --from ${REV_NOW}| awk '{print $2 ":" $1}'` ; do \
+for i in `mtn log --brief --no-graph --no-merges --to "${OLD_REV}" --from "${REV_NOW}"| awk '{print $2 ":" $1}'` ; do \
         export REV=`echo $i | awk -F: '{print $2}'`
         export AUTHOR=`echo $i | awk -F: '{print $1}'`
         export CL=`mtn ls certs ${REV} | grep -A 1 changelog | grep -v changelog | gawk -F'Value : '  '{ print $2 }'`
diff --git a/packages/altboot/altboot_1.1.1+wip-SVNR69.bb b/packages/altboot/altboot_1.1.1+wip-SVNR70.bb
index b9ee96d048..e22e992cc9 100644
--- a/packages/altboot/altboot_1.1.1+wip-SVNR69.bb
+++ b/packages/altboot/altboot_1.1.1+wip-SVNR70.bb
@@ -2,7 +2,7 @@ require altboot.inc
 
 PR = "r0"
 
-SVN_REV = "69"
+SVN_REV = "70"
 SRC_URI = "svn://hentges.net/public/altboot;module=trunk;rev=${SVN_REV} \
 	  "
 
diff --git a/packages/emacs/emacs-x11_20060801.bb b/packages/emacs/emacs-x11_20060801.bb
index 8b598bf21f..3878c42536 100644
--- a/packages/emacs/emacs-x11_20060801.bb
+++ b/packages/emacs/emacs-x11_20060801.bb
@@ -1,3 +1,5 @@
 require emacs-x11_cvs.bb
-SRCDATE = "${PV}"
+
+SRCDATE = "20060801"
+
 DEFAULT_PREFERENCE = "0"
diff --git a/packages/emacs/emacs-x11_cvs.bb b/packages/emacs/emacs-x11_cvs.bb
index 8fdba95742..809176a3c3 100644
--- a/packages/emacs/emacs-x11_cvs.bb
+++ b/packages/emacs/emacs-x11_cvs.bb
@@ -1,5 +1,8 @@
 require emacs_cvs.bb
+
 # full X (non-diet) is needed for X support
 DEPENDS += "libx11"
+
 EXTRA_OECONF = "--without-sound"
+
 RREPLACES = "emacs"
diff --git a/packages/emacs/emacs_20060801.bb b/packages/emacs/emacs_20060801.bb
index aa72944eca..834e5b6239 100644
--- a/packages/emacs/emacs_20060801.bb
+++ b/packages/emacs/emacs_20060801.bb
@@ -1,3 +1,3 @@
 require emacs_cvs.bb
-SRCDATE = "${PV}"
+SRCDATE = "20060801"
 DEFAULT_PREFERENCE = "0"
diff --git a/packages/emacs/emacs_cvs.bb b/packages/emacs/emacs_cvs.bb
index ef58dfa5b6..e8f263d1a9 100644
--- a/packages/emacs/emacs_cvs.bb
+++ b/packages/emacs/emacs_cvs.bb
@@ -7,7 +7,9 @@ DEPENDS += "qemu-native"
 #NOTE: I have found that this only works with qemu-0.8.0. If I use 0.8.1 or 0.8.2
 # the build gets hung up on compiling certain .el files
 
-PR = "r7"
+PV = "22.0.50+cvs${SRCDATE}" 
+PE = "1"
+PR = "r9"
 
 DEFAULT_PREFERENCE = "-1"
 
@@ -17,14 +19,14 @@ S = "${WORKDIR}/emacs"
 
 inherit autotools
 
-PACKAGES = "${PN}-el ${PN}-dbg ${PN} ${PN}-doc ${PN}-dev ${PN}-locale"
+PACKAGES =+ "${PN}-el"
 
-FILES_${PN}-el = "${datadir}/emacs/22.0.50/*/*.el.gz \
-                  ${datadir}/emacs/22.0.50/*/*/*.el.gz"
+FILES_${PN}-el = "${datadir}/emacs/*/*/*.el.gz \
+                  ${datadir}/emacs/*/*/*/*.el.gz"
 
 FILES_${PN} += "${datadir}/emacs"
 
-QEMU = "qemu-arm -L ${STAGING_DIR}/${TARGET_SYS}"
+QEMU = "qemu-${TARGET_ARCH} -L ${STAGING_DIR}/${TARGET_SYS}"
 LDFLAGS += "-L${CROSS_DIR}/${TARGET_SYS}/lib"
 
 EXTRA_OECONF = "--without-sound --without-x"
diff --git a/packages/fstests/fstests.bb b/packages/fstests/fstests.bb
index a84237f263..027a990200 100644
--- a/packages/fstests/fstests.bb
+++ b/packages/fstests/fstests.bb
@@ -3,7 +3,9 @@ HOMEPAGE = "http://www.o-hand.com"
 SECTION = "devel"
 LICENSE = "GPL"
 PV = "0.0+svn${SRCDATE}"
-PR = "r1"
+PR = "r2"
+
+DEPENDS = "gtk+"
 
 inherit autotools
 
diff --git a/packages/linux/linux-handhelds-2.6/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/asus620/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/asus620/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/asus620/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/asus620/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/asus620/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/asus620/defconfig
index 04946541d5..6a2bc0475b 100644
--- a/packages/linux/linux-handhelds-2.6/asus620/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/asus620/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh19
-# Thu Dec 13 13:04:42 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:12 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
diff --git a/packages/linux/linux-handhelds-2.6/asus730/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/asus730/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/asus730/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/asus730/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/asus730/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/asus730/defconfig
index afd7de8af5..f6c7789570 100644
--- a/packages/linux/linux-handhelds-2.6/asus730/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/asus730/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh19
-# Thu Dec 13 13:04:43 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:12 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
diff --git a/packages/linux/linux-handhelds-2.6/aximx50/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/aximx50/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/aximx50/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/aximx50/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/aximx50/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/aximx50/defconfig
index 3a610fa2a2..89bfc0908a 100644
--- a/packages/linux/linux-handhelds-2.6/aximx50/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/aximx50/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh19
-# Thu Dec 13 13:04:43 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:13 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
diff --git a/packages/linux/linux-handhelds-2.6/eteng500/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/eteng500/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/eteng500/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/eteng500/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/eteng500/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/eteng500/defconfig
index 4c1a93ad73..b1f87fb443 100644
--- a/packages/linux/linux-handhelds-2.6/eteng500/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/eteng500/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh19
-# Thu Dec 13 13:04:44 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:13 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
diff --git a/packages/linux/linux-handhelds-2.6/ghi270/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/ghi270/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/ghi270/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/ghi270/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/h1910/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/h1910/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/h1910/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/h1910/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/h1910/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/h1910/defconfig
index 2e57a63702..902434149b 100644
--- a/packages/linux/linux-handhelds-2.6/h1910/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/h1910/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh19
-# Thu Dec 13 13:04:44 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:14 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
diff --git a/packages/linux/linux-handhelds-2.6/h2200/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/h2200/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/h2200/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/h2200/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/h2200/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig
index 667f4f478e..1d53dfd987 100644
--- a/packages/linux/linux-handhelds-2.6/h2200/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh19
-# Thu Dec 13 13:04:45 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:14 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -510,8 +510,8 @@ CONFIG_BT_HCIUART_BCSP=y
 CONFIG_IEEE80211=m
 # CONFIG_IEEE80211_DEBUG is not set
 CONFIG_IEEE80211_CRYPT_WEP=m
-# CONFIG_IEEE80211_CRYPT_CCMP is not set
-# CONFIG_IEEE80211_CRYPT_TKIP is not set
+CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_CRYPT_TKIP=m
 CONFIG_IEEE80211_SOFTMAC=m
 # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
 CONFIG_WIRELESS_EXT=y
@@ -1710,7 +1710,7 @@ CONFIG_CRYPTO_ARC4=m
 # CONFIG_CRYPTO_KHAZAD is not set
 # CONFIG_CRYPTO_ANUBIS is not set
 # CONFIG_CRYPTO_DEFLATE is not set
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
+CONFIG_CRYPTO_MICHAEL_MIC=m
 # CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_TEST is not set
diff --git a/packages/linux/linux-handhelds-2.6/h3600/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/h3600/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/h3600/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/h3600/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/h3600/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/h3600/defconfig
index d30992b494..a8012cc460 100644
--- a/packages/linux/linux-handhelds-2.6/h3600/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/h3600/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh19
-# Thu Dec 13 13:04:45 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:15 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
diff --git a/packages/linux/linux-handhelds-2.6/h3800/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/h3800/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/h3800/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/h3800/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/h3800/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/h3800/defconfig
index ffcb91eb32..d110b3f223 100644
--- a/packages/linux/linux-handhelds-2.6/h3800/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/h3800/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh19
-# Thu Dec 13 13:04:46 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:15 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
diff --git a/packages/linux/linux-handhelds-2.6/h3900/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/h3900/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/h3900/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/h3900/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/h3900/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/h3900/defconfig
index dd88630b2d..fe9fa52b84 100644
--- a/packages/linux/linux-handhelds-2.6/h3900/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/h3900/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh19
-# Thu Dec 13 13:04:46 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:16 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
diff --git a/packages/linux/linux-handhelds-2.6/h4000/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/h4000/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/h4000/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/h4000/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/h4000/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/h4000/defconfig
index f04dad63cb..d0b8f08fbb 100644
--- a/packages/linux/linux-handhelds-2.6/h4000/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/h4000/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh19
-# Thu Dec 13 13:04:47 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:17 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -506,7 +506,12 @@ CONFIG_BT_HCIUART_BCSP=y
 # CONFIG_BT_HCIBLUECARD is not set
 # CONFIG_BT_HCIBTUART is not set
 # CONFIG_BT_HCIVHCI is not set
-# CONFIG_IEEE80211 is not set
+CONFIG_IEEE80211=m
+# CONFIG_IEEE80211_DEBUG is not set
+# CONFIG_IEEE80211_CRYPT_WEP is not set
+CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_CRYPT_TKIP=m
+# CONFIG_IEEE80211_SOFTMAC is not set
 CONFIG_WIRELESS_EXT=y
 
 #
@@ -1456,7 +1461,7 @@ CONFIG_CRYPTO_PCBC=m
 # CONFIG_CRYPTO_BLOWFISH is not set
 # CONFIG_CRYPTO_TWOFISH is not set
 # CONFIG_CRYPTO_SERPENT is not set
-# CONFIG_CRYPTO_AES is not set
+CONFIG_CRYPTO_AES=m
 # CONFIG_CRYPTO_CAST5 is not set
 # CONFIG_CRYPTO_CAST6 is not set
 # CONFIG_CRYPTO_TEA is not set
@@ -1464,7 +1469,7 @@ CONFIG_CRYPTO_ARC4=m
 # CONFIG_CRYPTO_KHAZAD is not set
 # CONFIG_CRYPTO_ANUBIS is not set
 # CONFIG_CRYPTO_DEFLATE is not set
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
+CONFIG_CRYPTO_MICHAEL_MIC=m
 # CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_TEST is not set
diff --git a/packages/linux/linux-handhelds-2.6/h5000/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/h5000/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/h5000/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/h5000/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/h5000/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/h5000/defconfig
index 004c26cf3b..a293dfea57 100644
--- a/packages/linux/linux-handhelds-2.6/h5000/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/h5000/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh19
-# Thu Dec 13 13:04:47 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:17 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
diff --git a/packages/linux/linux-handhelds-2.6/htcalpine/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/htcalpine/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/htcalpine/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/htcalpine/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/htcalpine/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/htcalpine/defconfig
index ad409c78b0..0733574b59 100644
--- a/packages/linux/linux-handhelds-2.6/htcalpine/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/htcalpine/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh19
-# Thu Dec 13 13:04:49 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:19 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
diff --git a/packages/linux/linux-handhelds-2.6/htcapache/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/htcapache/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/htcapache/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/htcapache/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/htcapache/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/htcapache/defconfig
index 8ffb03322b..04c849d5b8 100644
--- a/packages/linux/linux-handhelds-2.6/htcapache/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/htcapache/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh19
-# Thu Dec 13 13:04:49 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:19 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -445,7 +445,12 @@ CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIUART_H4=y
 CONFIG_BT_HCIUART_BCSP=y
 # CONFIG_BT_HCIVHCI is not set
-# CONFIG_IEEE80211 is not set
+CONFIG_IEEE80211=m
+# CONFIG_IEEE80211_DEBUG is not set
+# CONFIG_IEEE80211_CRYPT_WEP is not set
+CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_CRYPT_TKIP=m
+# CONFIG_IEEE80211_SOFTMAC is not set
 CONFIG_WIRELESS_EXT=y
 
 #
@@ -1327,7 +1332,7 @@ CONFIG_CRYPTO_PCBC=m
 # CONFIG_CRYPTO_BLOWFISH is not set
 # CONFIG_CRYPTO_TWOFISH is not set
 # CONFIG_CRYPTO_SERPENT is not set
-# CONFIG_CRYPTO_AES is not set
+CONFIG_CRYPTO_AES=m
 # CONFIG_CRYPTO_CAST5 is not set
 # CONFIG_CRYPTO_CAST6 is not set
 # CONFIG_CRYPTO_TEA is not set
@@ -1335,7 +1340,7 @@ CONFIG_CRYPTO_ARC4=m
 # CONFIG_CRYPTO_KHAZAD is not set
 # CONFIG_CRYPTO_ANUBIS is not set
 # CONFIG_CRYPTO_DEFLATE is not set
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
+CONFIG_CRYPTO_MICHAEL_MIC=m
 # CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_TEST is not set
diff --git a/packages/linux/linux-handhelds-2.6/htcbeetles/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/htcbeetles/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/htcbeetles/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/htcbeetles/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/htcbeetles/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/htcbeetles/defconfig
index db1f76fbfa..c295e2a1c6 100644
--- a/packages/linux/linux-handhelds-2.6/htcbeetles/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/htcbeetles/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh19
-# Thu Dec 13 13:04:50 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:20 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
diff --git a/packages/linux/linux-handhelds-2.6/htcblueangel/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/htcblueangel/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/htcblueangel/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/htcblueangel/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/htcblueangel/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/htcblueangel/defconfig
index edf57d037b..61f84a4588 100644
--- a/packages/linux/linux-handhelds-2.6/htcblueangel/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/htcblueangel/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh19
-# Thu Dec 13 13:04:50 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:20 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -470,7 +470,12 @@ CONFIG_BT_HCIUART_BCSP=y
 # CONFIG_BT_HCIBLUECARD is not set
 # CONFIG_BT_HCIBTUART is not set
 # CONFIG_BT_HCIVHCI is not set
-# CONFIG_IEEE80211 is not set
+CONFIG_IEEE80211=m
+# CONFIG_IEEE80211_DEBUG is not set
+# CONFIG_IEEE80211_CRYPT_WEP is not set
+CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_CRYPT_TKIP=m
+# CONFIG_IEEE80211_SOFTMAC is not set
 CONFIG_WIRELESS_EXT=y
 
 #
@@ -1483,7 +1488,7 @@ CONFIG_CRYPTO_PCBC=m
 # CONFIG_CRYPTO_BLOWFISH is not set
 # CONFIG_CRYPTO_TWOFISH is not set
 # CONFIG_CRYPTO_SERPENT is not set
-# CONFIG_CRYPTO_AES is not set
+CONFIG_CRYPTO_AES=m
 # CONFIG_CRYPTO_CAST5 is not set
 # CONFIG_CRYPTO_CAST6 is not set
 # CONFIG_CRYPTO_TEA is not set
@@ -1491,7 +1496,7 @@ CONFIG_CRYPTO_ARC4=m
 # CONFIG_CRYPTO_KHAZAD is not set
 # CONFIG_CRYPTO_ANUBIS is not set
 # CONFIG_CRYPTO_DEFLATE is not set
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
+CONFIG_CRYPTO_MICHAEL_MIC=m
 # CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_TEST is not set
diff --git a/packages/linux/linux-handhelds-2.6/htchimalaya/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/htchimalaya/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/htchimalaya/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/htchimalaya/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/htchimalaya/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/htchimalaya/defconfig
index d67400b02b..507d5e4541 100644
--- a/packages/linux/linux-handhelds-2.6/htchimalaya/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/htchimalaya/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh19
-# Thu Dec 13 13:04:51 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:21 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
diff --git a/packages/linux/linux-handhelds-2.6/htcsable/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/htcsable/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/htcsable/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/htcsable/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/htcsable/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/htcsable/defconfig
index d81cb02201..9ee6a3cdd3 100644
--- a/packages/linux/linux-handhelds-2.6/htcsable/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/htcsable/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh19
-# Thu Dec 13 13:04:51 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:21 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -449,7 +449,12 @@ CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIUART_H4=y
 CONFIG_BT_HCIUART_BCSP=y
 # CONFIG_BT_HCIVHCI is not set
-# CONFIG_IEEE80211 is not set
+CONFIG_IEEE80211=m
+# CONFIG_IEEE80211_DEBUG is not set
+# CONFIG_IEEE80211_CRYPT_WEP is not set
+CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_CRYPT_TKIP=m
+# CONFIG_IEEE80211_SOFTMAC is not set
 CONFIG_WIRELESS_EXT=y
 
 #
@@ -1354,7 +1359,7 @@ CONFIG_CRYPTO_PCBC=m
 # CONFIG_CRYPTO_BLOWFISH is not set
 # CONFIG_CRYPTO_TWOFISH is not set
 # CONFIG_CRYPTO_SERPENT is not set
-# CONFIG_CRYPTO_AES is not set
+CONFIG_CRYPTO_AES=m
 # CONFIG_CRYPTO_CAST5 is not set
 # CONFIG_CRYPTO_CAST6 is not set
 # CONFIG_CRYPTO_TEA is not set
@@ -1362,7 +1367,7 @@ CONFIG_CRYPTO_ARC4=m
 # CONFIG_CRYPTO_KHAZAD is not set
 # CONFIG_CRYPTO_ANUBIS is not set
 # CONFIG_CRYPTO_DEFLATE is not set
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
+CONFIG_CRYPTO_MICHAEL_MIC=m
 # CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_TEST is not set
diff --git a/packages/linux/linux-handhelds-2.6/htcuniversal/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/htcuniversal/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/htcuniversal/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/htcuniversal/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/htcuniversal/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/htcuniversal/defconfig
index c8ee782d61..9da03d8f2e 100644
--- a/packages/linux/linux-handhelds-2.6/htcuniversal/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/htcuniversal/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh19
-# Thu Dec 13 13:04:52 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:22 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -456,7 +456,12 @@ CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIUART_H4=y
 CONFIG_BT_HCIUART_BCSP=y
 # CONFIG_BT_HCIVHCI is not set
-# CONFIG_IEEE80211 is not set
+CONFIG_IEEE80211=m
+# CONFIG_IEEE80211_DEBUG is not set
+# CONFIG_IEEE80211_CRYPT_WEP is not set
+CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_CRYPT_TKIP=m
+# CONFIG_IEEE80211_SOFTMAC is not set
 CONFIG_WIRELESS_EXT=y
 
 #
@@ -1363,7 +1368,7 @@ CONFIG_CRYPTO_PCBC=m
 # CONFIG_CRYPTO_BLOWFISH is not set
 # CONFIG_CRYPTO_TWOFISH is not set
 # CONFIG_CRYPTO_SERPENT is not set
-# CONFIG_CRYPTO_AES is not set
+CONFIG_CRYPTO_AES=m
 # CONFIG_CRYPTO_CAST5 is not set
 # CONFIG_CRYPTO_CAST6 is not set
 # CONFIG_CRYPTO_TEA is not set
@@ -1371,7 +1376,7 @@ CONFIG_CRYPTO_ARC4=m
 # CONFIG_CRYPTO_KHAZAD is not set
 # CONFIG_CRYPTO_ANUBIS is not set
 # CONFIG_CRYPTO_DEFLATE is not set
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
+CONFIG_CRYPTO_MICHAEL_MIC=m
 # CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_TEST is not set
diff --git a/packages/linux/linux-handhelds-2.6/htcwallaby/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/htcwallaby/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/htcwallaby/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/htcwallaby/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/htcwallaby/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/htcwallaby/defconfig
index 13038ab67e..d69e574934 100644
--- a/packages/linux/linux-handhelds-2.6/htcwallaby/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/htcwallaby/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh19
-# Thu Dec 13 13:04:52 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:22 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
diff --git a/packages/linux/linux-handhelds-2.6/hx4700/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/hx4700/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/hx4700/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/hx4700/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/hx4700/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/hx4700/defconfig
index 9a4f7cb072..97403f4a22 100644
--- a/packages/linux/linux-handhelds-2.6/hx4700/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/hx4700/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh19
-# Thu Dec 13 13:04:48 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:18 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -518,8 +518,8 @@ CONFIG_BT_HCIUART_BCSP=y
 CONFIG_IEEE80211=m
 # CONFIG_IEEE80211_DEBUG is not set
 CONFIG_IEEE80211_CRYPT_WEP=m
-# CONFIG_IEEE80211_CRYPT_CCMP is not set
-# CONFIG_IEEE80211_CRYPT_TKIP is not set
+CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_CRYPT_TKIP=m
 CONFIG_IEEE80211_SOFTMAC=m
 # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
 CONFIG_WIRELESS_EXT=y
@@ -1727,7 +1727,7 @@ CONFIG_CRYPTO_ARC4=m
 # CONFIG_CRYPTO_KHAZAD is not set
 # CONFIG_CRYPTO_ANUBIS is not set
 # CONFIG_CRYPTO_DEFLATE is not set
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
+CONFIG_CRYPTO_MICHAEL_MIC=m
 # CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_TEST is not set
diff --git a/packages/linux/linux-handhelds-2.6/looxc550/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/looxc550/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/looxc550/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/looxc550/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/looxc550/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/looxc550/defconfig
index 48eee4b67f..83aff689f4 100644
--- a/packages/linux/linux-handhelds-2.6/looxc550/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/looxc550/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh19
-# Thu Dec 13 13:04:53 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:23 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
diff --git a/packages/linux/linux-handhelds-2.6/magician/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/magician/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/magician/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/magician/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/magician/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/magician/defconfig
index 47a436084a..477ae6ead4 100644
--- a/packages/linux/linux-handhelds-2.6/magician/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/magician/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh19
-# Thu Dec 13 13:04:48 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:18 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
diff --git a/packages/linux/linux-handhelds-2.6/rx1950/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/rx1950/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/rx1950/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/rx1950/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/rx1950/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/rx1950/defconfig
index 2f5423c28a..f717a91179 100644
--- a/packages/linux/linux-handhelds-2.6/rx1950/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/rx1950/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh19
-# Thu Dec 13 13:04:53 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:23 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
diff --git a/packages/linux/linux-handhelds-2.6/rx3000/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/rx3000/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/rx3000/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/rx3000/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/rx3000/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/rx3000/defconfig
index 0100f9b641..af0393df6b 100644
--- a/packages/linux/linux-handhelds-2.6/rx3000/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/rx3000/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh19
-# Thu Dec 13 13:04:54 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:24 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -445,7 +445,12 @@ CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIUART_H4=y
 CONFIG_BT_HCIUART_BCSP=y
 # CONFIG_BT_HCIVHCI is not set
-# CONFIG_IEEE80211 is not set
+CONFIG_IEEE80211=m
+# CONFIG_IEEE80211_DEBUG is not set
+# CONFIG_IEEE80211_CRYPT_WEP is not set
+CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_CRYPT_TKIP=m
+# CONFIG_IEEE80211_SOFTMAC is not set
 CONFIG_WIRELESS_EXT=y
 
 #
@@ -1398,7 +1403,7 @@ CONFIG_CRYPTO_PCBC=m
 # CONFIG_CRYPTO_BLOWFISH is not set
 # CONFIG_CRYPTO_TWOFISH is not set
 # CONFIG_CRYPTO_SERPENT is not set
-# CONFIG_CRYPTO_AES is not set
+CONFIG_CRYPTO_AES=m
 # CONFIG_CRYPTO_CAST5 is not set
 # CONFIG_CRYPTO_CAST6 is not set
 # CONFIG_CRYPTO_TEA is not set
@@ -1406,7 +1411,7 @@ CONFIG_CRYPTO_ARC4=m
 # CONFIG_CRYPTO_KHAZAD is not set
 # CONFIG_CRYPTO_ANUBIS is not set
 # CONFIG_CRYPTO_DEFLATE is not set
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
+CONFIG_CRYPTO_MICHAEL_MIC=m
 # CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_TEST is not set
diff --git a/packages/linux/linux-handhelds-2.6_2.6.21-hh16.bb b/packages/linux/linux-handhelds-2.6_2.6.21-hh16.bb
deleted file mode 100644
index 275602762d..0000000000
--- a/packages/linux/linux-handhelds-2.6_2.6.21-hh16.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-SECTION = "kernel"
-DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
-LICENSE = "GPL"
-PR = "r2"
-
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
-           file://defconfig"
-
-require linux-handhelds-2.6.inc
diff --git a/packages/linux/linux-handhelds-2.6_2.6.21-hh17.bb b/packages/linux/linux-handhelds-2.6_2.6.21-hh17.bb
index ae3741e872..a9dd604d8f 100644
--- a/packages/linux/linux-handhelds-2.6_2.6.21-hh17.bb
+++ b/packages/linux/linux-handhelds-2.6_2.6.21-hh17.bb
@@ -5,6 +5,10 @@ PR = "r3"
 
 DEFAULT_PREFERENCE = "-1"
 
+# Override where to look for defconfigs and patches,
+# we have per-kernel-release sets.
+FILESPATH = "${FILE_DIRNAME}/linux-handhelds-2.6-2.6.21/${MACHINE}:${FILE_DIRNAME}/linux-handhelds-2.6-2.6.21"
+
 SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
            file://defconfig"
 
diff --git a/packages/linux/linux-handhelds-2.6_2.6.21-hh18.bb b/packages/linux/linux-handhelds-2.6_2.6.21-hh18.bb
index b34d4630a0..cb6e7efc13 100644
--- a/packages/linux/linux-handhelds-2.6_2.6.21-hh18.bb
+++ b/packages/linux/linux-handhelds-2.6_2.6.21-hh18.bb
@@ -5,6 +5,10 @@ PR = "r0"
 
 DEFAULT_PREFERENCE = "-1"
 
+# Override where to look for defconfigs and patches,
+# we have per-kernel-release sets.
+FILESPATH = "${FILE_DIRNAME}/linux-handhelds-2.6-2.6.21/${MACHINE}:${FILE_DIRNAME}/linux-handhelds-2.6-2.6.21"
+
 SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
            file://defconfig"
 
diff --git a/packages/linux/linux-handhelds-2.6_2.6.21-hh19.bb b/packages/linux/linux-handhelds-2.6_2.6.21-hh19.bb
deleted file mode 100644
index ae3741e872..0000000000
--- a/packages/linux/linux-handhelds-2.6_2.6.21-hh19.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-SECTION = "kernel"
-DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
-LICENSE = "GPL"
-PR = "r3"
-
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
-           file://defconfig"
-
-require linux-handhelds-2.6.inc
diff --git a/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb b/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb
index b34d4630a0..48f3f224e2 100644
--- a/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb
+++ b/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb
@@ -1,10 +1,14 @@
 SECTION = "kernel"
 DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
 LICENSE = "GPL"
-PR = "r0"
+PR = "r2"
 
 DEFAULT_PREFERENCE = "-1"
 
+# Override where to look for defconfigs and patches,
+# we have per-kernel-release sets.
+FILESPATH = "${FILE_DIRNAME}/linux-handhelds-2.6-2.6.21/${MACHINE}:${FILE_DIRNAME}/linux-handhelds-2.6-2.6.21"
+
 SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
            file://defconfig"
 
diff --git a/packages/linux/linux-handhelds-2.6_cvs.bb b/packages/linux/linux-handhelds-2.6_cvs.bb
index 4e008f5b6e..89cb68548f 100644
--- a/packages/linux/linux-handhelds-2.6_cvs.bb
+++ b/packages/linux/linux-handhelds-2.6_cvs.bb
@@ -6,10 +6,14 @@ PR = "r0"
 
 DEFAULT_PREFERENCE = "-1"
 
+# Override where to look for defconfigs and patches,
+# we have per-kernel-release sets.
+FILESPATH = "${FILE_DIRNAME}/linux-handhelds-2.6-2.6.21/${MACHINE}:${FILE_DIRNAME}/linux-handhelds-2.6-2.6.21"
+
 K_MAJOR = "2"
 K_MINOR = "6"
 K_MICRO = "21"
-HHV     = "14"
+HHV     = "20"
 
 SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26  \
            file://defconfig"
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index 41f940858a..da1fdf97cd 100644
--- a/packages/tasks/task-base.bb
+++ b/packages/tasks/task-base.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r53"
+PR = "r54"
 
 inherit task
 
diff --git a/packages/tasks/task-boot.bb b/packages/tasks/task-boot.bb
index 0435c2aa62..5663ff5a3d 100644
--- a/packages/tasks/task-boot.bb
+++ b/packages/tasks/task-boot.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Basic task to get a device booting"
-PR = "r42"
+PR = "r43"
 
 inherit task
 
diff --git a/packages/xserver-common/files/unbreak-simpad.patch b/packages/xserver-common/files/unbreak-simpad.patch
new file mode 100644
index 0000000000..7f557c317d
--- /dev/null
+++ b/packages/xserver-common/files/unbreak-simpad.patch
@@ -0,0 +1,18 @@
+--- xserver-common-1.18/X11/Xinit.d/12keymap.org	2007-08-24 14:14:31.000000000 +0300
++++ xserver-common-1.18/X11/Xinit.d/12keymap	2007-12-22 15:06:52.000000000 +0200
+@@ -15,14 +15,11 @@
+         "Sharp-Collie")
+                 xmodmap - < /etc/X11/collie.xmodmap
+                 ;;
+-	"Simpad")
+-		xmodmap - < /etc/X11/simpad.xmodmap
+-		;;
+ 	"HP iPAQ h6300")
+ 		xmodmap - < /etc/X11/h6300.xmodmap
+ 		;;
+ 	# All the rest of keyboardless PDA machines use common buttonmap
+-	"HP iPAQ"* | "Asus MyPal"*)
++	"Simpad" | "HP iPAQ"* | "Asus MyPal"*)
+ 		xmodmap - < /etc/X11/keyboardless.xmodmap
+ 		;;
+ esac
diff --git a/packages/xserver-common/xserver-common_1.18.bb b/packages/xserver-common/xserver-common_1.18.bb
index a30a37c893..bf7b049939 100644
--- a/packages/xserver-common/xserver-common_1.18.bb
+++ b/packages/xserver-common/xserver-common_1.18.bb
@@ -2,14 +2,14 @@ DESCRIPTION = "Common X11 scripts and support files"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
-PR = "r0"
+PR = "r1"
 
 PACKAGE_ARCH = "all"
 
 # we are using a gpe-style Makefile
 inherit gpe
 
-SRC_URI_append = " file://setDPI.sh "
+SRC_URI_append = " file://unbreak-simpad.patch;patch=1 file://setDPI.sh "
 
 do_install_append() {
 	install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"