Merge branch 'master' into openelec-pvr-master

2025-07-24 11:16:51 +00:00 · 2011-04-17 09:53:33 +02:00 · 2011-04-17 09:53:33 +02:00 · 0f3302233b
commit 0f3302233b
parent c87bd4ec61 5d2972cc0d
104 changed files with 1737 additions and 10721 deletions
--- a/packages/databases/sqlite/meta
+++ b/packages/databases/sqlite/meta
@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="sqlite"
-PKG_VERSION="autoconf-3070500"
+PKG_VERSION="autoconf-3070601"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="PublicDomain"
--- a/packages/databases/sqlite/patches/sqlite-3.7.3-010_ldflags.patch
+++ b/packages/databases/sqlite/patches/sqlite-3.7.3-010_ldflags.patch
@ -1,33 +0,0 @@
-diff -Naur sqlite-3.6.13/Makefile.in sqlite-3.6.13.patch/Makefile.in
--- sqlite-3.6.13/Makefile.in	2009-04-13 10:57:54.000000000 +0200
-+++ sqlite-3.6.13.patch/Makefile.in	2009-04-19 18:49:22.036813333 +0200
-@@ -158,6 +158,11 @@
- STRIP = @STRIP@
- THREADSAFE_FLAGS = @THREADSAFE_FLAGS@
- VERSION = @VERSION@
-+
-+# OE overrides
-+#
-+TARGET_LFLAGS = $(config_TARGET_LFLAGS)
-+
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
-@@ -283,7 +288,7 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- libsqlite3.la: $(libsqlite3_la_OBJECTS) $(libsqlite3_la_DEPENDENCIES) 
-	$(LINK) -rpath $(libdir) $(libsqlite3_la_LDFLAGS) $(libsqlite3_la_OBJECTS) $(libsqlite3_la_LIBADD) $(LIBS)
-+	$(LINK) -rpath $(libdir) $(libsqlite3_la_LDFLAGS) $(libsqlite3_la_OBJECTS) $(libsqlite3_la_LIBADD) $(TARGET_LFLAGS) $(LIBS)
- install-binPROGRAMS: $(bin_PROGRAMS)
- 	@$(NORMAL_INSTALL)
- 	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
-@@ -314,7 +319,7 @@
- 	done
- sqlite3$(EXEEXT): $(sqlite3_OBJECTS) $(sqlite3_DEPENDENCIES) 
- 	@rm -f sqlite3$(EXEEXT)
-	$(LINK) $(sqlite3_LDFLAGS) $(sqlite3_OBJECTS) $(sqlite3_LDADD) $(LIBS)
-+	$(LINK) $(sqlite3_LDFLAGS) $(sqlite3_OBJECTS) $(sqlite3_LDADD) $(TARGET_LFLAGS) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
--- a/packages/devel/glib/meta
+++ b/packages/devel/glib/meta
@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="glib"
-PKG_VERSION="2.28.5"
+PKG_VERSION="2.28.6"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"
--- a/packages/graphics/libdrm/meta
+++ b/packages/graphics/libdrm/meta
@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="libdrm"
-PKG_VERSION="2.4.24"
+PKG_VERSION="2.4.25"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
--- a/packages/lang/php/build
+++ b/packages/lang/php/build
@ -0,0 +1,76 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+strip_lto
+
+cd $PKG_BUILD
+./configure --host=$TARGET_NAME \
+            --build=$HOST_NAME \
+            --prefix=/usr \
+            --disable-static \
+            --enable-shared \
+            --mandir=/usr/share/man \
+            --infodir=/usr/share/info \
+            --disable-all \
+            --without-pear \
+            --with-config-file-path=/etc \
+            --localstatedir=/var \
+            --disable-cli \
+            --enable-cgi \
+            --enable-fastcgi \
+            --disable-sockets \
+            --disable-posix \
+            --disable-spl \
+            --disable-session \
+            --without-openssl \
+            --disable-libxml \
+            --disable-xml \
+            --disable-xmlreader \
+            --disable-xmlwriter \
+            --disable-simplexml \
+            --with-zlib=$SYSROOT_PREFIX/usr \
+            --disable-exif \
+            --disable-ftp \
+            --without-gettext \
+            --without-gmp \
+            --disable-json \
+            --without-readline \
+            --without-ncurses \
+            --disable-pcntl \
+            --disable-sysvmsg \
+            --disable-sysvsem \
+            --disable-sysvshm \
+            --disable-zip \
+            --disable-filter \
+            --disable-calendar \
+            --with-curl=$SYSROOT_PREFIX/usr \
+            --with-pcre-regex \
+            --without-sqlite \
+            --with-sqlite3=$SYSROOT_PREFIX/usr \
+            --enable-sqlite-utf8 \
+            --disable-pdo \
+            --without-pdo-sqlite \
+            --without-pdo-mysql \
+
+make
--- a/packages/lang/php/install
+++ b/packages/lang/php/install
@ -0,0 +1,37 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+mkdir -p $INSTALL/usr/bin
+  cp $PKG_BUILD/sapi/cgi/php-cgi $INSTALL/usr/bin
+
+mkdir -p $INSTALL/etc
+  cp $PKG_BUILD/php.ini-production $INSTALL/etc/php.ini
+  sed -e "s|^doc_root[[:space:]]*=.*$|doc_root = /usr/www|" \
+      -e "s|^.cgi.force_redirect[[:space:]]*=.*$|cgi.force_redirect = 0|" \
+      -i $INSTALL/etc/php.ini
+
+mkdir -p $INSTALL/usr/www
+  echo "<?php" > $INSTALL/usr/www/test.php
+  echo "phpinfo();" >> $INSTALL/usr/www/test.php
+  echo "?>" >> $INSTALL/usr/www/test.php
--- a/packages/lang/php/meta
+++ b/packages/lang/php/meta
@ -0,0 +1,36 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="php"
+PKG_VERSION="5.3.6"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="OpenSource"
+PKG_SITE="http://www.php.net"
+PKG_URL="http://www.php.net/distributions/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_DEPENDS="zlib pcre sqlite curl"
+PKG_BUILD_DEPENDS="toolchain zlib pcre sqlite curl"
+PKG_PRIORITY="optional"
+PKG_SECTION="web"
+PKG_SHORTDESC="php: Scripting language especially suited for Web development"
+PKG_LONGDESC="PHP is a widely-used general-purpose scripting language that is especially suited for Web development and can be embedded into HTML."
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"
--- a/packages/linux-firmware/dvb-firmware/meta
+++ b/packages/linux-firmware/dvb-firmware/meta
@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="dvb-firmware"
-PKG_VERSION="0.0.6"
+PKG_VERSION="0.0.7"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Free-to-use"
--- a/packages/linux/meta
+++ b/packages/linux/meta
@ -19,13 +19,13 @@
 ################################################################################

 PKG_NAME="linux"
-PKG_VERSION="2.6.38.2"
+PKG_VERSION="2.6.39-rc3"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.kernel.org"
-PKG_URL="http://www.kernel.org/pub/linux/kernel/v2.6/$PKG_NAME-$PKG_VERSION.tar.bz2"
-#PKG_URL="http://www.kernel.org/pub/linux/kernel/v2.6/testing/$PKG_NAME-$PKG_VERSION.tar.bz2"
+#PKG_URL="http://www.kernel.org/pub/linux/kernel/v2.6/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="http://www.kernel.org/pub/linux/kernel/v2.6/testing/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="busybox linux-drivers linux-firmware"
 PKG_BUILD_DEPENDS="toolchain busybox-hosttools xz"
 PKG_PRIORITY="optional"
--- a/packages/linux/patches/linux-2.6.38.2-051_add_ite-cir_driver-0.1.patch
+++ b/packages/linux/patches/linux-2.6.38.2-051_add_ite-cir_driver-0.1.patch
--- a/packages/linux/patches/linux-2.6.38.2-110-drm_nouveau_upstream-20110330.patch
+++ b/packages/linux/patches/linux-2.6.38.2-110-drm_nouveau_upstream-20110330.patch
--- a/packages/linux/patches/linux-2.6.39-rc2-000_crosscompile.patch
+++ b/packages/linux/patches/linux-2.6.39-rc2-000_crosscompile.patch
@ -1,22 +0,0 @@
--- linux-2.6.24-rc2.orig/arch/x86/boot/tools/build.c	2007-10-06 12:26:14.000000000 +0200
-+++ linux-2.6.24-rc2/arch/x86/boot/tools/build.c	2007-10-06 12:27:36.000000000 +0200
-@@ -29,7 +29,6 @@
- #include <stdarg.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-#include <sys/sysmacros.h>
- #include <unistd.h>
- #include <fcntl.h>
- #include <sys/mman.h>
-@@ -42,6 +41,11 @@
- #define DEFAULT_MAJOR_ROOT 0
- #define DEFAULT_MINOR_ROOT 0
- 
-+#undef major
-+#define major(dev) ((int)(((dev) >> 8) & 0xff))
-+#undef minor
-+#define minor(dev) ((int)((dev) & 0xff))
-+
- /* Minimal number of setup sectors */
- #define SETUP_SECT_MIN 5
- #define SETUP_SECT_MAX 64
--- a/packages/linux/patches/linux-2.6.39-rc2-002_bash_only_feature.patch
+++ b/packages/linux/patches/linux-2.6.39-rc2-002_bash_only_feature.patch
@ -1,15 +0,0 @@
-Index: linux-2.6.16/scripts/gen_initramfs_list.sh
-===================================================================
--- linux-2.6.16.orig/scripts/gen_initramfs_list.sh	2006-03-20 18:41:34.000000000 +0100
-+++ linux-2.6.16/scripts/gen_initramfs_list.sh	2006-03-20 18:42:40.000000000 +0100
-@@ -56,9 +56,7 @@
- 
- parse() {
- 	local location="$1"
-	local name="${location/${srcdir}//}"
-	# change '//' into '/'
-	name="${name//\/\///}"
-+	local name="$(echo "$location" | sed -e 's%$srcdir%%' -e 's%//*%/%g')"
- 	local mode="$2"
- 	local uid="$3"
- 	local gid="$4"
--- a/packages/linux/patches/linux-2.6.39-rc2-003-no_dev_console.patch
+++ b/packages/linux/patches/linux-2.6.39-rc2-003-no_dev_console.patch
@ -1,20 +0,0 @@
-diff -Naur linux-2.6.34-rc7/init/main.c linux-2.6.34-rc7.patch/init/main.c
--- linux-2.6.34-rc7/init/main.c	2010-05-10 03:36:28.000000000 +0200
-+++ linux-2.6.34-rc7.patch/init/main.c	2010-05-15 12:28:34.767241760 +0200
-@@ -886,8 +886,14 @@
- 	do_basic_setup();
- 
- 	/* Open the /dev/console on the rootfs, this should never fail */
-	if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
-		printk(KERN_WARNING "Warning: unable to open an initial console.\n");
-+	char *console = "/dev_console";
-+
-+	if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0) {
-+		sys_mknod(console, S_IFCHR|0600, (TTYAUX_MAJOR<<8)|1);
-+		if (sys_open(console, O_RDWR, 0) < 0)
-+			printk(KERN_WARNING "Warning: unable to open an initial console.\n");
-+		sys_unlink(console);
-+	}
- 
- 	(void) sys_dup(0);
- 	(void) sys_dup(0);
--- a/packages/linux/patches/linux-2.6.39-rc2-004_lower_undefined_mode_timeout.patch
+++ b/packages/linux/patches/linux-2.6.39-rc2-004_lower_undefined_mode_timeout.patch
@ -1,24 +0,0 @@
-diff -Naur linux-2.6.23-rc9.orig/arch/i386/boot/tty.c linux-2.6.23-rc9/arch/i386/boot/tty.c
--- linux-2.6.23-rc9.orig/arch/x86/boot/tty.c	2007-10-06 12:26:14.000000000 +0200
-+++ linux-2.6.23-rc9/arch/x86/boot/tty.c	2007-10-06 12:37:47.000000000 +0200
-@@ -92,7 +92,7 @@
- 
- int getchar_timeout(void)
- {
-	int cnt = 30;
-+	int cnt = 3;
- 	int t0, t1;
- 
- 	t0 = gettime();
-diff -Naur linux-2.6.23-rc9.orig/arch/i386/boot/video.c linux-2.6.23-rc9/arch/i386/boot/video.c
--- linux-2.6.23-rc9.orig/arch/x86/boot/video.c	2007-10-06 12:26:14.000000000 +0200
-+++ linux-2.6.23-rc9/arch/x86/boot/video.c	2007-10-06 12:36:05.000000000 +0200
-@@ -329,7 +329,7 @@
- 	unsigned int sel;
- 
- 	puts("Press <ENTER> to see video modes available, "
-	     "<SPACE> to continue, or wait 30 sec\n");
-+	     "<SPACE> to continue, or wait 3 sec\n");
- 
- 	kbd_flush();
- 	while (1) {
--- a/packages/linux/patches/linux-2.6.39-rc2-005_kconfig_no_timestamp.patch
+++ b/packages/linux/patches/linux-2.6.39-rc2-005_kconfig_no_timestamp.patch
@ -1,13 +0,0 @@
-Index: linux-2.6.16/scripts/kconfig/confdata.c
-===================================================================
--- linux-2.6.16.orig/scripts/kconfig/confdata.c	2006-03-20 06:53:29.000000000 +0100
-+++ linux-2.6.16/scripts/kconfig/confdata.c	2006-03-20 18:47:06.000000000 +0100
-@@ -340,7 +340,7 @@
- 	int type, l;
- 	const char *str;
- 	time_t now;
-	int use_timestamp = 1;
-+	int use_timestamp = 0;
- 	char *env;
- 
- 	dirname[0] = 0;
--- a/packages/linux/patches/linux-2.6.39-rc2-006_enable_utf8.patch
+++ b/packages/linux/patches/linux-2.6.39-rc2-006_enable_utf8.patch
@ -1,25 +0,0 @@
-diff -Naur linux-2.6.31-rc4.orig/fs/fat/inode.c linux-2.6.31-rc4/fs/fat/inode.c
--- linux-2.6.31-rc4.orig/fs/fat/inode.c	2009-07-25 12:47:41.000000000 +0200
-+++ linux-2.6.31-rc4/fs/fat/inode.c	2009-07-25 13:38:18.000000000 +0200
-@@ -979,7 +979,8 @@
- 	}
- 	opts->name_check = 'n';
- 	opts->quiet = opts->showexec = opts->sys_immutable = opts->dotsOK =  0;
-	opts->utf8 = opts->unicode_xlate = 0;
-+	opts->utf8 = 1;
-+	opts->unicode_xlate = 0;
- 	opts->numtail = 1;
- 	opts->usefree = opts->nocase = 0;
- 	opts->tz_utc = 0;
-diff -Naur linux-2.6.31-rc4.orig/fs/isofs/inode.c linux-2.6.31-rc4/fs/isofs/inode.c
--- linux-2.6.31-rc4.orig/fs/isofs/inode.c	2009-07-25 12:47:41.000000000 +0200
-+++ linux-2.6.31-rc4/fs/isofs/inode.c	2009-07-25 13:38:49.000000000 +0200
-@@ -377,7 +377,7 @@
- 	popt->gid = 0;
- 	popt->uid = 0;
- 	popt->iocharset = NULL;
-	popt->utf8 = 0;
-+	popt->utf8 = 1;
- 	popt->overriderockperm = 0;
- 	popt->session=-1;
- 	popt->sbsector=-1;
--- a/packages/linux/patches/linux-2.6.39-rc2-007_die_floppy_die.patch
+++ b/packages/linux/patches/linux-2.6.39-rc2-007_die_floppy_die.patch
@ -1,30 +0,0 @@
-From 4ff58b642f80dedb20533978123d89b5ac9b1ed5 Mon Sep 17 00:00:00 2001
-From: Kyle McMartin <kyle@phobos.i.jkkm.org>
-Date: Tue, 30 Mar 2010 00:04:29 -0400
-Subject: die-floppy-die
-
-Kill the floppy.ko pnp modalias. We were surviving just fine without
-autoloading floppy drivers, tyvm.
-
-Please feel free to register all complaints in the wastepaper bin.
---
- drivers/block/floppy.c |    3 +--
- 1 files changed, 1 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
-index 90c4038..f4a0b90 100644
--- a/drivers/block/floppy.c
-+++ b/drivers/block/floppy.c
-@@ -4619,8 +4619,7 @@ static const struct pnp_device_id floppy_pnpids[] = {
- 	{"PNP0700", 0},
- 	{}
- };
-
-MODULE_DEVICE_TABLE(pnp, floppy_pnpids);
-+/* MODULE_DEVICE_TABLE(pnp, floppy_pnpids); */
- 
- #else
- 
-- 
-1.7.0.1
-
--- a/packages/linux/patches/linux-2.6.39-rc2-008-hda_intel_prealloc_4mb_dmabuffer.patch
+++ b/packages/linux/patches/linux-2.6.39-rc2-008-hda_intel_prealloc_4mb_dmabuffer.patch
@ -1,47 +0,0 @@
-From c69fcbd1f60b0842f7c1ad2c95692ffd19c4932b Mon Sep 17 00:00:00 2001
-From: Kyle McMartin <kyle@phobos.i.jkkm.org>
-Date: Mon, 29 Mar 2010 23:56:08 -0400
-Subject: hda_intel-prealloc-4mb-dmabuffer
-
---
- sound/pci/hda/hda_intel.c |   14 +++++++++++++-
- 1 files changed, 13 insertions(+), 1 deletions(-)
-
-diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
-index 4bb9067..37db515 100644
--- a/sound/pci/hda/hda_intel.c
-+++ b/sound/pci/hda/hda_intel.c
-@@ -1986,6 +1986,7 @@ azx_attach_pcm_stream(struct hda_bus *bus, struct hda_codec *codec,
- 	struct azx_pcm *apcm;
- 	int pcm_dev = cpcm->device;
- 	int s, err;
-+	size_t prealloc_min = 64*1024;	/* 64KB */
- 
- 	if (pcm_dev >= HDA_MAX_PCMS) {
- 		snd_printk(KERN_ERR SFX "Invalid PCM device number %d\n",
-@@ -2019,10 +2020,21 @@ azx_attach_pcm_stream(struct hda_bus *bus, struct hda_codec *codec,
- 		if (cpcm->stream[s].substreams)
- 			snd_pcm_set_ops(pcm, s, &azx_pcm_ops);
- 	}
-+
- 	/* buffer pre-allocation */
-+
-+	/* subtle, don't allocate a big buffer for modems...
-+	 * also, don't just test 32BIT_MASK, since azx supports
-+	 * 64-bit DMA in some cases.
-+	 */
-+	/* lennart wants a 2.2MB buffer for 2sec of 48khz */
-+	if (pcm->dev_class == SNDRV_PCM_CLASS_GENERIC &&
-+	    chip->pci->dma_mask >= DMA_32BIT_MASK)
-+		prealloc_min = 4 * 1024 * 1024;	/* 4MB */
-+
- 	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG,
- 					      snd_dma_pci_data(chip->pci),
-					      1024 * 64, 32 * 1024 * 1024);
-+					      prealloc_min, 32 * 1024 * 1024);
- 	return 0;
- }
- 
-- 
-1.7.0.1
-
--- a/packages/linux/patches/linux-2.6.39-rc2-009_disable_i8042_check_on_apple_mac.patch
+++ b/packages/linux/patches/linux-2.6.39-rc2-009_disable_i8042_check_on_apple_mac.patch
@ -1,59 +0,0 @@
-From 2a79554c864ac58fa2ad982f0fcee2cc2aa33eb5 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Thu, 20 May 2010 10:30:31 -0400
-Subject: Disable i8042 checks on Intel Apple Macs
-
-As those computers never had any i8042 controllers, and the
-current lookup code could potentially lock up/hang/wait for
-timeout for long periods of time.
-
-Fixes intermittent hangs on boot on a MacbookAir1,1
-
-Signed-off-by: Bastien Nocera <hadess@hadess.net>
---
- drivers/input/serio/i8042.c |   22 ++++++++++++++++++++++
- 1 files changed, 22 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
-index 6440a8f..4d7cf98 100644
--- a/drivers/input/serio/i8042.c
-+++ b/drivers/input/serio/i8042.c
-@@ -1451,6 +1451,22 @@ static struct platform_driver i8042_driver = {
- 	.shutdown	= i8042_shutdown,
- };
- 
-+#ifdef CONFIG_DMI
-+static struct dmi_system_id __initdata dmi_system_table[] = {
-+	{
-+		.matches = {
-+			DMI_MATCH(DMI_BIOS_VENDOR, "Apple Computer, Inc.")
-+		},
-+	},
-+	{
-+		.matches = {
-+			DMI_MATCH(DMI_BIOS_VENDOR, "Apple Inc.")
-+		},
-+	},
-+	{}
-+};
-+#endif /*CONFIG_DMI*/
-+
- static int __init i8042_init(void)
- {
- 	struct platform_device *pdev;
-@@ -1458,6 +1474,12 @@ static int __init i8042_init(void)
- 
- 	dbg_init();
- 
-+#ifdef CONFIG_DMI
-+	/* Intel Apple Macs never have an i8042 controller */
-+	if (dmi_check_system(dmi_system_table) > 0)
-+		return -ENODEV;
-+#endif /*CONFIG_DMI*/
-+
- 	err = i8042_platform_init();
- 	if (err)
- 		return err;
-- 
-1.7.0.1
-
--- a/packages/linux/patches/linux-2.6.39-rc2-050_add_appleir_usb_driver.patch
+++ b/packages/linux/patches/linux-2.6.39-rc2-050_add_appleir_usb_driver.patch
@ -1,702 +0,0 @@
-From e11e9e78799a7641fe0dc5289f35f2604a4b71a3 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Sun, 17 Jan 2010 00:40:15 +0000
-Subject: [PATCH] Input: add appleir USB driver
-
-This driver was originally written by James McKenzie, updated by
-Greg Kroah-Hartman, further updated by myself, with suspend support
-added.
-
-More recent versions of the IR receiver are also supported through
-a patch by Alex Karpenko. The patch also adds support for the 2nd
-and 5th generation of the controller, and the menu key on newer
-brushed metal remotes.
-
-Tested on a MacbookAir1,1
-
-Signed-off-by: Bastien Nocera <hadess@hadess.net>
---
- Documentation/input/appleir.txt |   46 ++++
- drivers/hid/hid-apple.c         |    4 -
- drivers/hid/hid-core.c          |    7 +-
- drivers/hid/hid-ids.h           |    5 +-
- drivers/input/misc/Kconfig      |   13 +
- drivers/input/misc/Makefile     |    1 +
- drivers/input/misc/appleir.c    |  519 +++++++++++++++++++++++++++++++++++++++
- 7 files changed, 588 insertions(+), 7 deletions(-)
- create mode 100644 Documentation/input/appleir.txt
- create mode 100644 drivers/input/misc/appleir.c
-
-diff --git a/Documentation/input/appleir.txt b/Documentation/input/appleir.txt
-new file mode 100644
-index 0000000..db637fb
--- /dev/null
-+++ b/Documentation/input/appleir.txt
-@@ -0,0 +1,46 @@
-+Apple IR receiver Driver (appleir)
-+----------------------------------
-+	Copyright (C) 2009 Bastien Nocera <hadess@hadess.net>
-+
-+The appleir driver is a kernel input driver to handle Apple's IR
-+receivers (and associated remotes) in the kernel.
-+
-+The driver is an input driver which only handles "official" remotes
-+as built and sold by Apple.
-+
-+Authors
-+-------
-+
-+James McKenzie (original driver)
-+Alex Karpenko (05ac:8242 support)
-+Greg Kroah-Hartman (cleanups and original submission)
-+Bastien Nocera (further cleanups, brushed metal "enter"
-+button support and suspend support)
-+
-+Supported hardware
-+------------------
-+
-+- All Apple laptops and desktops from 2005 onwards, except:
-+  - the unibody Macbook (2009)
-+  - Mac Pro (all versions)
-+- Apple TV (all revisions prior to September 2010)
-+
-+The remote will only support the 6 (old white) or 7 (brushed metal) buttons
-+of the remotes as sold by Apple. See the next section if you want to use
-+other remotes or want to use lirc with the device instead of the kernel driver.
-+
-+Using lirc (native) instead of the kernel driver
-+------------------------------------------------
-+
-+First, you will need to disable the kernel driver for the receiver.
-+
-+This can be achieved by passing quirks to the usbhid driver.
-+The quirk line would be:
-+usbhid.quirks=0x05ac:0x8242:0x40000010
-+
-+With 0x05ac being the vendor ID (Apple, you shouldn't need to change this)
-+With 0x8242 being the product ID (check the output of lsusb for your hardware)
-+And 0x10 being "HID_QUIRK_HIDDEV_FORCE" and 0x40000000 being "HID_QUIRK_NO_IGNORE"
-+
-+This should force the creation of a hiddev device for the receiver, and
-+make it usable under lirc.
-diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c
-index bba05d0..0059d5a 100644
--- a/drivers/hid/hid-apple.c
-+++ b/drivers/hid/hid-apple.c
-@@ -361,10 +361,6 @@ static void apple_remove(struct hid_device *hdev)
- }
- 
- static const struct hid_device_id apple_devices[] = {
-	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ATV_IRCONTROL),
-		.driver_data = APPLE_HIDDEV | APPLE_IGNORE_HIDINPUT },
-	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL4),
-		.driver_data = APPLE_HIDDEV | APPLE_IGNORE_HIDINPUT },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MIGHTYMOUSE),
- 		.driver_data = APPLE_MIGHTYMOUSE | APPLE_INVERT_HWHEEL },
- 
-diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
-index baa25ad..abc5bd7 100644
--- a/drivers/hid/hid-core.c
-+++ b/drivers/hid/hid-core.c
-@@ -1244,8 +1244,6 @@ static const struct hid_device_id hid_blacklist[] = {
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_X5_005D) },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_RP_649) },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_ACRUX, 0x0802) },
-	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ATV_IRCONTROL) },
-	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL4) },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MIGHTYMOUSE) },
- 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGICMOUSE) },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_ANSI) },
-@@ -1577,6 +1575,11 @@ static const struct hid_device_id hid_ignore_list[] = {
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_24) },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_AIRCABLE, USB_DEVICE_ID_AIRCABLE1) },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_ALCOR, USB_DEVICE_ID_ALCOR_USBRS232) },
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL) },
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL2) },
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL3) },
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL4) },
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL5) },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_LCM)},
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_LCM2)},
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_AVERMEDIA, USB_DEVICE_ID_AVER_FM_MR800) },
-diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
-index 11af537..360a5ca 100644
--- a/drivers/hid/hid-ids.h
-+++ b/drivers/hid/hid-ids.h
-@@ -100,8 +100,11 @@
- #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS   0x023b
- #define USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY	0x030a
- #define USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY	0x030b
-#define USB_DEVICE_ID_APPLE_ATV_IRCONTROL	0x8241
-+#define USB_DEVICE_ID_APPLE_IRCONTROL	0x8240
-+#define USB_DEVICE_ID_APPLE_IRCONTROL2	0x1440
-+#define USB_DEVICE_ID_APPLE_IRCONTROL3	0x8241
- #define USB_DEVICE_ID_APPLE_IRCONTROL4	0x8242
-+#define USB_DEVICE_ID_APPLE_IRCONTROL5	0x8243
- 
- #define USB_VENDOR_ID_ASUS		0x0486
- #define USB_DEVICE_ID_ASUS_T91MT	0x0185
-diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
-index 60de906..2f2f2e7 100644
--- a/drivers/input/misc/Kconfig
-+++ b/drivers/input/misc/Kconfig
-@@ -209,6 +209,19 @@ config INPUT_KEYSPAN_REMOTE
- 	  To compile this driver as a module, choose M here: the module will
- 	  be called keyspan_remote.
- 
-+config INPUT_APPLEIR
-+	tristate "Apple infrared receiver (built in)"
-+	depends on USB_ARCH_HAS_HCD
-+	select USB
-+	help
-+	  Say Y here if you want to use a Apple infrared remote control. All
-+	  the Apple computers from 2005 onwards include such a port, except
-+	  the unibody Macbook (2009), and Mac Pros. This receiver is also
-+	  used in the Apple TV set-top box prior to the 2010 model.
-+
-+	  To compile this driver as a module, choose M here: the module will
-+	  be called appleir.
-+
- config INPUT_POWERMATE
- 	tristate "Griffin PowerMate and Contour Jog support"
- 	depends on USB_ARCH_HAS_HCD
-diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile
-index 1fe1f6c..d5ef2b9 100644
--- a/drivers/input/misc/Makefile
-+++ b/drivers/input/misc/Makefile
-@@ -13,6 +13,7 @@ obj-$(CONFIG_INPUT_ADXL34X)		+= adxl34x.o
- obj-$(CONFIG_INPUT_ADXL34X_I2C)		+= adxl34x-i2c.o
- obj-$(CONFIG_INPUT_ADXL34X_SPI)		+= adxl34x-spi.o
- obj-$(CONFIG_INPUT_APANEL)		+= apanel.o
-+obj-$(CONFIG_INPUT_APPLEIR)		+= appleir.o
- obj-$(CONFIG_INPUT_ATI_REMOTE)		+= ati_remote.o
- obj-$(CONFIG_INPUT_ATI_REMOTE2)		+= ati_remote2.o
- obj-$(CONFIG_INPUT_ATLAS_BTNS)		+= atlas_btns.o
-diff --git a/drivers/input/misc/appleir.c b/drivers/input/misc/appleir.c
-new file mode 100644
-index 0000000..3817a3c
--- /dev/null
-+++ b/drivers/input/misc/appleir.c
-@@ -0,0 +1,519 @@
-+/*
-+ * appleir: USB driver for the apple ir device
-+ *
-+ * Original driver written by James McKenzie
-+ * Ported to recent 2.6 kernel versions by Greg Kroah-Hartman <gregkh@suse.de>
-+ *
-+ * Copyright (C) 2006 James McKenzie
-+ * Copyright (C) 2008 Greg Kroah-Hartman <greg@kroah.com>
-+ * Copyright (C) 2008 Novell Inc.
-+ *
-+ * This program is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License as published by the Free
-+ * Software Foundation, version 2.
-+ *
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/slab.h>
-+#include <linux/input.h>
-+#include <linux/usb/input.h>
-+#include <linux/module.h>
-+#include <linux/init.h>
-+#include <linux/usb.h>
-+#include <linux/usb/input.h>
-+#include <asm/unaligned.h>
-+#include <asm/byteorder.h>
-+
-+#define DRIVER_VERSION "v1.2"
-+#define DRIVER_AUTHOR "James McKenzie"
-+#define DRIVER_DESC "Apple infrared receiver driver"
-+#define DRIVER_LICENSE "GPL"
-+
-+MODULE_AUTHOR(DRIVER_AUTHOR);
-+MODULE_DESCRIPTION(DRIVER_DESC);
-+MODULE_LICENSE(DRIVER_LICENSE);
-+
-+#define USB_VENDOR_ID_APPLE			0x05ac
-+#define USB_DEVICE_ID_APPLE_IRCONTROL		0x8240
-+#define USB_DEVICE_ID_APPLE_IRCONTROL2		0x1440
-+#define USB_DEVICE_ID_APPLE_IRCONTROL3		0x8241
-+#define USB_DEVICE_ID_APPLE_IRCONTROL4		0x8242
-+#define USB_DEVICE_ID_APPLE_IRCONTROL5		0x8243
-+
-+#define URB_SIZE	32
-+
-+#define MAX_KEYS	9
-+#define MAX_KEYS_MASK	(MAX_KEYS - 1)
-+
-+#define dbginfo(dev, format, arg...) do { if (debug) dev_info(dev , format , ## arg); } while (0)
-+
-+static int debug;
-+module_param(debug, int, 0644);
-+MODULE_PARM_DESC(debug, "Enable extra debug messages and information");
-+
-+/* I have two devices both of which report the following */
-+/* 25 87 ee 83 0a  	+  */
-+/* 25 87 ee 83 0c  	-  */
-+/* 25 87 ee 83 09	<< */
-+/* 25 87 ee 83 06	>> */
-+/* 25 87 ee 83 05	>" */
-+/* 25 87 ee 83 03	menu */
-+/* 26 00 00 00 00	for key repeat*/
-+
-+/* Thomas Glanzmann reports the following responses */
-+/* 25 87 ee ca 0b	+  */
-+/* 25 87 ee ca 0d	-  */
-+/* 25 87 ee ca 08	<< */
-+/* 25 87 ee ca 07	>> */
-+/* 25 87 ee ca 04	>" */
-+/* 25 87 ee ca 02 	menu */
-+/* 26 00 00 00 00       for key repeat*/
-+/* He also observes the following event sometimes */
-+/* sent after a key is release, which I interpret */
-+/* as a flat battery message */
-+/* 25 87 e0 ca 06	flat battery */
-+
-+/* Alexandre Karpenko reports the following responses for Device ID 0x8242 */
-+/* 25 87 ee 47 0b	+  */
-+/* 25 87 ee 47 0d	-  */
-+/* 25 87 ee 47 08	<< */
-+/* 25 87 ee 47 07	>> */
-+/* 25 87 ee 47 04	>" */
-+/* 25 87 ee 47 02 	menu */
-+/* 26 87 ee 47 ** 	for key repeat (** is the code of the key being held) */
-+
-+/* Bastien Nocera's "new" remote */
-+/* 25 87 ee 91 5f	followed by
-+ * 25 87 ee 91 05	gives you >"
-+ *
-+ * 25 87 ee 91 5c	followed by
-+ * 25 87 ee 91 05	gives you the middle button */
-+
-+static const unsigned short appleir_key_table[] = {
-+	KEY_RESERVED,
-+	KEY_MENU,
-+	KEY_PLAYPAUSE,
-+	KEY_FORWARD,
-+	KEY_BACK,
-+	KEY_VOLUMEUP,
-+	KEY_VOLUMEDOWN,
-+	KEY_ENTER,
-+	KEY_RESERVED,
-+};
-+
-+struct appleir {
-+	struct input_dev *input_dev;
-+	unsigned short keymap[ARRAY_SIZE(appleir_key_table)];
-+	u8 *data;
-+	dma_addr_t dma_buf;
-+	struct usb_device *usbdev;
-+	unsigned int flags;
-+	struct urb *urb;
-+	struct timer_list key_up_timer;
-+	int current_key;
-+	int prev_key_idx;
-+	char phys[32];
-+};
-+
-+static DEFINE_MUTEX(appleir_mutex);
-+
-+enum {
-+	APPLEIR_OPENED = 0x1,
-+	APPLEIR_SUSPENDED = 0x2,
-+};
-+
-+static struct usb_device_id appleir_ids[] = {
-+	{ USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL) },
-+	{ USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL2) },
-+	{ USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL3) },
-+	{ USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL4) },
-+	{ USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL5) },
-+	{}
-+};
-+MODULE_DEVICE_TABLE(usb, appleir_ids);
-+
-+static void dump_packet(struct appleir *appleir, char *msg, u8 *data, int len)
-+{
-+	int i;
-+
-+	printk(KERN_ERR "appleir: %s (%d bytes)", msg, len);
-+
-+	for (i = 0; i < len; ++i)
-+		printk(" %02x", data[i]);
-+	printk(" (should be command %d)\n", (data[4] >> 1) & MAX_KEYS_MASK);
-+}
-+
-+static int get_key(int data)
-+{
-+	switch (data) {
-+	case 0x02:
-+	case 0x03:
-+		/* menu */
-+		return 1;
-+	case 0x04:
-+	case 0x05:
-+		/* >" */
-+		return 2;
-+	case 0x06:
-+	case 0x07:
-+		/* >> */
-+		return 3;
-+	case 0x08:
-+	case 0x09:
-+		/* << */
-+		return 4;
-+	case 0x0a:
-+	case 0x0b:
-+		/* + */
-+		return 5;
-+	case 0x0c:
-+	case 0x0d:
-+		/* - */
-+		return 6;
-+	case 0x5c:
-+		/* Middle button, on newer remotes,
-+		 * part of a 2 packet-command */
-+		return -7;
-+	default:
-+		return -1;
-+	}
-+}
-+
-+static void key_up(struct appleir *appleir, int key)
-+{
-+	dbginfo(&appleir->input_dev->dev, "key %d up\n", key);
-+	input_report_key(appleir->input_dev, key, 0);
-+	input_sync(appleir->input_dev);
-+}
-+
-+static void key_down(struct appleir *appleir, int key)
-+{
-+	dbginfo(&appleir->input_dev->dev, "key %d down\n", key);
-+	input_report_key(appleir->input_dev, key, 1);
-+	input_sync(appleir->input_dev);
-+}
-+
-+static void battery_flat(struct appleir *appleir)
-+{
-+	dev_err(&appleir->input_dev->dev, "possible flat battery?\n");
-+}
-+
-+static void key_up_tick(unsigned long data)
-+{
-+	struct appleir *appleir = (struct appleir *)data;
-+
-+	if (appleir->current_key) {
-+		key_up(appleir, appleir->current_key);
-+		appleir->current_key = 0;
-+	}
-+}
-+
-+static void new_data(struct appleir *appleir, u8 *data, int len)
-+{
-+	static const u8 keydown[] = { 0x25, 0x87, 0xee };
-+	static const u8 keyrepeat[] = { 0x26, };
-+	static const u8 flatbattery[] = { 0x25, 0x87, 0xe0 };
-+
-+	if (debug)
-+		dump_packet(appleir, "received", data, len);
-+
-+	if (len != 5)
-+		return;
-+
-+	if (!memcmp(data, keydown, sizeof(keydown))) {
-+		int index;
-+
-+		/* If we already have a key down, take it up before marking
-+		   this one down */
-+		if (appleir->current_key)
-+			key_up(appleir, appleir->current_key);
-+
-+		/* Handle dual packet commands */
-+		if (appleir->prev_key_idx > 0)
-+			index = appleir->prev_key_idx;
-+		else
-+			index = get_key(data[4]);
-+
-+		if (index > 0) {
-+			appleir->current_key = appleir->keymap[index];
-+
-+			key_down(appleir, appleir->current_key);
-+			/* Remote doesn't do key up, either pull them up, in the test
-+			   above, or here set a timer which pulls them up after 1/8 s */
-+			mod_timer(&appleir->key_up_timer, jiffies + HZ / 8);
-+			appleir->prev_key_idx = 0;
-+			return;
-+		} else if (index == -7) {
-+			/* Remember key for next packet */
-+			appleir->prev_key_idx = 0 - index;
-+			return;
-+		}
-+	}
-+
-+	appleir->prev_key_idx = 0;
-+
-+	if (!memcmp(data, keyrepeat, sizeof(keyrepeat))) {
-+		key_down(appleir, appleir->current_key);
-+		/* Remote doesn't do key up, either pull them up, in the test
-+		   above, or here set a timer which pulls them up after 1/8 s */
-+		mod_timer(&appleir->key_up_timer, jiffies + HZ / 8);
-+		return;
-+	}
-+
-+	if (!memcmp(data, flatbattery, sizeof(flatbattery))) {
-+		battery_flat(appleir);
-+		/* Fall through */
-+	}
-+
-+	dump_packet(appleir, "unknown packet", data, len);
-+}
-+
-+static void appleir_urb(struct urb *urb)
-+{
-+	struct appleir *appleir = urb->context;
-+	int status = urb->status;
-+	int retval;
-+
-+	switch (status) {
-+	case 0:
-+		new_data(appleir, urb->transfer_buffer, urb->actual_length);
-+		break;
-+	case -ECONNRESET:
-+	case -ENOENT:
-+	case -ESHUTDOWN:
-+		/* This urb is terminated, clean up */
-+		dbginfo(&appleir->input_dev->dev, "%s - urb shutting down with status: %d", __func__,
-+			urb->status);
-+		return;
-+	default:
-+		dbginfo(&appleir->input_dev->dev, "%s - nonzero urb status received: %d", __func__,
-+			urb->status);
-+	}
-+
-+	retval = usb_submit_urb(urb, GFP_ATOMIC);
-+	if (retval)
-+		err("%s - usb_submit_urb failed with result %d", __func__,
-+		    retval);
-+}
-+
-+static int appleir_open(struct input_dev *dev)
-+{
-+	struct appleir *appleir = input_get_drvdata(dev);
-+	struct usb_interface *intf = usb_ifnum_to_if(appleir->usbdev, 0);
-+	int r;
-+
-+	r = usb_autopm_get_interface(intf);
-+	if (r) {
-+		dev_err(&intf->dev,
-+			"%s(): usb_autopm_get_interface() = %d\n", __func__, r);
-+		return r;
-+	}
-+
-+	mutex_lock(&appleir_mutex);
-+
-+	if (usb_submit_urb(appleir->urb, GFP_ATOMIC)) {
-+		r = -EIO;
-+		goto fail;
-+	}
-+
-+	appleir->flags |= APPLEIR_OPENED;
-+
-+	mutex_unlock(&appleir_mutex);
-+
-+	usb_autopm_put_interface(intf);
-+
-+	return 0;
-+fail:
-+	mutex_unlock(&appleir_mutex);
-+	usb_autopm_put_interface(intf);
-+	return r;
-+}
-+
-+static void appleir_close(struct input_dev *dev)
-+{
-+	struct appleir *appleir = input_get_drvdata(dev);
-+
-+	mutex_lock(&appleir_mutex);
-+
-+	if (!(appleir->flags & APPLEIR_SUSPENDED)) {
-+		usb_kill_urb(appleir->urb);
-+		del_timer_sync(&appleir->key_up_timer);
-+	}
-+
-+	appleir->flags &= ~APPLEIR_OPENED;
-+
-+	mutex_unlock(&appleir_mutex);
-+}
-+
-+static int appleir_probe(struct usb_interface *intf,
-+			 const struct usb_device_id *id)
-+{
-+	struct usb_device *dev = interface_to_usbdev(intf);
-+	struct usb_endpoint_descriptor *endpoint;
-+	struct appleir *appleir = NULL;
-+	struct input_dev *input_dev;
-+	int retval = -ENOMEM;
-+	int i;
-+
-+	appleir = kzalloc(sizeof(struct appleir), GFP_KERNEL);
-+	if (!appleir)
-+		goto allocfail;
-+
-+	appleir->data = usb_alloc_coherent(dev, URB_SIZE, GFP_KERNEL,
-+					 &appleir->dma_buf);
-+	if (!appleir->data)
-+		goto usbfail;
-+
-+	appleir->urb = usb_alloc_urb(0, GFP_KERNEL);
-+	if (!appleir->urb)
-+		goto urbfail;
-+
-+	appleir->usbdev = dev;
-+
-+	input_dev = input_allocate_device();
-+	if (!input_dev)
-+		goto inputfail;
-+
-+	appleir->input_dev = input_dev;
-+
-+	usb_make_path(dev, appleir->phys, sizeof(appleir->phys));
-+	strlcpy(appleir->phys, "/input0", sizeof(appleir->phys));
-+
-+	input_dev->name = "Apple Infrared Remote Controller";
-+	input_dev->phys = appleir->phys;
-+	usb_to_input_id(dev, &input_dev->id);
-+	input_dev->dev.parent = &intf->dev;
-+	input_dev->keycode = appleir->keymap;
-+	input_dev->keycodesize = sizeof(unsigned short);
-+	input_dev->keycodemax = ARRAY_SIZE(appleir->keymap);
-+
-+	input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP);
-+
-+	memcpy(appleir->keymap, appleir_key_table, sizeof(appleir->keymap));
-+	for (i = 0; i < ARRAY_SIZE(appleir_key_table); i++)
-+		set_bit(appleir->keymap[i], input_dev->keybit);
-+	clear_bit(KEY_RESERVED, input_dev->keybit);
-+
-+	input_set_drvdata(input_dev, appleir);
-+	input_dev->open = appleir_open;
-+	input_dev->close = appleir_close;
-+
-+	endpoint = &intf->cur_altsetting->endpoint[0].desc;
-+
-+	usb_fill_int_urb(appleir->urb, dev,
-+			 usb_rcvintpipe(dev, endpoint->bEndpointAddress),
-+			 appleir->data, 8,
-+			 appleir_urb, appleir, endpoint->bInterval);
-+
-+	appleir->urb->transfer_dma = appleir->dma_buf;
-+	appleir->urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
-+
-+	setup_timer(&appleir->key_up_timer,
-+		    key_up_tick, (unsigned long) appleir);
-+
-+	retval = input_register_device(appleir->input_dev);
-+	if (retval)
-+		goto inputfail;
-+
-+	usb_set_intfdata(intf, appleir);
-+
-+	return 0;
-+
-+inputfail:
-+	input_free_device(appleir->input_dev);
-+
-+urbfail:
-+	usb_free_urb(appleir->urb);
-+
-+usbfail:
-+	usb_free_coherent(dev, URB_SIZE, appleir->data,
-+			appleir->dma_buf);
-+
-+allocfail:
-+	kfree(appleir);
-+
-+	return retval;
-+}
-+
-+static void appleir_disconnect(struct usb_interface *intf)
-+{
-+	struct appleir *appleir = usb_get_intfdata(intf);
-+
-+	usb_set_intfdata(intf, NULL);
-+	input_unregister_device(appleir->input_dev);
-+	usb_free_urb(appleir->urb);
-+	usb_free_coherent(interface_to_usbdev(intf), URB_SIZE,
-+			appleir->data, appleir->dma_buf);
-+	kfree(appleir);
-+}
-+
-+static int appleir_suspend(struct usb_interface *interface,
-+			   pm_message_t message)
-+{
-+	struct appleir *appleir = usb_get_intfdata(interface);
-+
-+	mutex_lock(&appleir_mutex);
-+	if (appleir->flags & APPLEIR_OPENED)
-+		usb_kill_urb(appleir->urb);
-+
-+	appleir->flags |= APPLEIR_SUSPENDED;
-+
-+	mutex_unlock(&appleir_mutex);
-+
-+	return 0;
-+}
-+
-+static int appleir_resume(struct usb_interface *interface)
-+{
-+	struct appleir *appleir;
-+	int r = 0;
-+
-+	appleir = usb_get_intfdata(interface);
-+
-+	mutex_lock(&appleir_mutex);
-+	if (appleir->flags & APPLEIR_OPENED) {
-+		struct usb_endpoint_descriptor *endpoint;
-+
-+		endpoint = &interface->cur_altsetting->endpoint[0].desc;
-+		usb_fill_int_urb(appleir->urb, appleir->usbdev,
-+				 usb_rcvintpipe(appleir->usbdev, endpoint->bEndpointAddress),
-+				 appleir->data, 8,
-+				 appleir_urb, appleir, endpoint->bInterval);
-+		appleir->urb->transfer_dma = appleir->dma_buf;
-+		appleir->urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
-+
-+		/* And reset the USB device */
-+		if (usb_submit_urb(appleir->urb, GFP_ATOMIC))
-+			r = -EIO;
-+	}
-+
-+	appleir->flags &= ~APPLEIR_SUSPENDED;
-+
-+	mutex_unlock(&appleir_mutex);
-+
-+	return r;
-+}
-+
-+static struct usb_driver appleir_driver = {
-+	.name                 = "appleir",
-+	.probe                = appleir_probe,
-+	.disconnect           = appleir_disconnect,
-+	.suspend              = appleir_suspend,
-+	.resume               = appleir_resume,
-+	.reset_resume         = appleir_resume,
-+	.id_table             = appleir_ids,
-+};
-+
-+static int __init appleir_init(void)
-+{
-+	return usb_register(&appleir_driver);
-+}
-+
-+static void __exit appleir_exit(void)
-+{
-+	usb_deregister(&appleir_driver);
-+}
-+
-+module_init(appleir_init);
-+module_exit(appleir_exit);
-- 
-1.7.2.2
-
--- a/packages/linux/patches/linux-2.6.39-rc2-052-aureal_remote_quirk-0.1.patch
+++ b/packages/linux/patches/linux-2.6.39-rc2-052-aureal_remote_quirk-0.1.patch
@ -1,113 +0,0 @@
-diff -Naur linux-2.6.37/drivers/hid/hid-aureal.c linux-2.6.37.patch/drivers/hid/hid-aureal.c
--- linux-2.6.37/drivers/hid/hid-aureal.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37.patch/drivers/hid/hid-aureal.c	2011-01-07 22:35:31.413389936 +0100
-@@ -0,0 +1,60 @@
-+/*
-+ *  HID driver for some sunplus "special" devices
-+ *
-+ *  Copyright (c) 1999 Andreas Gal
-+ *  Copyright (c) 2000-2005 Vojtech Pavlik <vojtech@suse.cz>
-+ *  Copyright (c) 2005 Michael Haboustak <mike-@cinci.rr.com> for Concept2, Inc
-+ *  Copyright (c) 2006-2007 Jiri Kosina
-+ *  Copyright (c) 2007 Paul Walmsley
-+ *  Copyright (c) 2008 Jiri Slaby
-+ *  Copyright (c) 2010 Franco Catrin <fcatrin@gmail.com>
-+ */
-+
-+/*
-+ * This program is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License as published by the Free
-+ * Software Foundation; either version 2 of the License, or (at your option)
-+ * any later version.
-+ */
-+
-+#include <linux/device.h>
-+#include <linux/hid.h>
-+#include <linux/module.h>
-+
-+#include "hid-ids.h"
-+
-+static __u8 *aureal_report_fixup(struct hid_device *hdev, __u8 *rdesc,
-+		unsigned int *rsize)
-+{
-+	if (*rsize >= 54 && rdesc[52] == 0x25 && rdesc[53] == 0x01) {
-+		dev_info(&hdev->dev, "fixing Aureal Cy se W-01RN USB_V3.1 "
-+				"report descriptor. Keyboard Logical Maximum = 101\n");
-+		rdesc[53] = 0x65;
-+	} return rdesc;
-+}
-+
-+static const struct hid_device_id aureal_devices[] = {
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_AUREAL, USB_DEVICE_ID_AUREAL_W01RN) },
-+	{ }
-+};
-+MODULE_DEVICE_TABLE(hid, aureal_devices);
-+
-+static struct hid_driver aureal_driver = {
-+	.name = "aureal",
-+	.id_table = aureal_devices,
-+	.report_fixup = aureal_report_fixup,
-+};
-+
-+static int __init aureal_init(void)
-+{
-+	return hid_register_driver(&aureal_driver);
-+}
-+
-+static void __exit aureal_exit(void)
-+{
-+	hid_unregister_driver(&aureal_driver);
-+}
-+
-+module_init(aureal_init);
-+module_exit(aureal_exit);
-+MODULE_LICENSE("GPL");
-diff -Naur linux-2.6.37/drivers/hid/hid-ids.h linux-2.6.37.patch/drivers/hid/hid-ids.h
--- linux-2.6.37/drivers/hid/hid-ids.h	2011-01-05 01:50:19.000000000 +0100
-+++ linux-2.6.37.patch/drivers/hid/hid-ids.h	2011-01-07 22:35:31.414389949 +0100
-@@ -6,6 +6,7 @@
-  *  Copyright (c) 2005 Michael Haboustak <mike-@cinci.rr.com> for Concept2, Inc
-  *  Copyright (c) 2006-2007 Jiri Kosina
-  *  Copyright (c) 2007 Paul Walmsley
-+ *  Copyright (c) 2010 Franco Catrin <fcatrin@gmail.com>
-  */
- 
- /*
-@@ -327,6 +328,9 @@
- #define USB_DEVICE_ID_KYE_ERGO_525V	0x0087
- #define USB_DEVICE_ID_KYE_GPEN_560	0x5003
- 
-+#define USB_VENDOR_ID_AUREAL		0x0755
-+#define USB_DEVICE_ID_AUREAL_W01RN	0x2626
-+
- #define USB_VENDOR_ID_LABTEC		0x1020
- #define USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD	0x0006
- 
-diff -Naur linux-2.6.37/drivers/hid/Kconfig linux-2.6.37.patch/drivers/hid/Kconfig
--- linux-2.6.37/drivers/hid/Kconfig	2011-01-05 01:50:19.000000000 +0100
-+++ linux-2.6.37.patch/drivers/hid/Kconfig	2011-01-07 22:35:31.467390603 +0100
-@@ -87,6 +87,13 @@
- 	Say Y here if you want support for keyboards of	Apple iBooks, PowerBooks,
- 	MacBooks, MacBook Pros and Apple Aluminum.
- 
-+config HID_AUREAL
-+	tristate "Aureal" if EMBEDDED
-+	depends on USB_HID
-+	default !EMBEDDED
-+	---help---
-+	Support for Aureal Cy se W-01RN Remote Controller
-+
- config HID_BELKIN
- 	tristate "Belkin Flip KVM and Wireless keyboard" if EMBEDDED
- 	depends on USB_HID
-diff -Naur linux-2.6.37/drivers/hid/Makefile linux-2.6.37.patch/drivers/hid/Makefile
--- linux-2.6.37/drivers/hid/Makefile	2011-01-05 01:50:19.000000000 +0100
-+++ linux-2.6.37.patch/drivers/hid/Makefile	2011-01-07 22:35:31.547391590 +0100
-@@ -29,6 +29,7 @@
- obj-$(CONFIG_HID_A4TECH)	+= hid-a4tech.o
- obj-$(CONFIG_HID_ACRUX_FF)	+= hid-axff.o
- obj-$(CONFIG_HID_APPLE)		+= hid-apple.o
-+obj-$(CONFIG_HID_AUREAL)	+= hid-aureal.o
- obj-$(CONFIG_HID_BELKIN)	+= hid-belkin.o
- obj-$(CONFIG_HID_CANDO)		+= hid-cando.o
- obj-$(CONFIG_HID_CHERRY)	+= hid-cherry.o
--- a/packages/linux/patches/linux-2.6.39-rc2-053_ati-remote_all_keys_and_keychange-0.1.patch
+++ b/packages/linux/patches/linux-2.6.39-rc2-053_ati-remote_all_keys_and_keychange-0.1.patch
@ -1,65 +0,0 @@
-diff -Naur linux-2.6.37-rc6/drivers/input/misc/ati_remote.c linux-2.6.37-rc6.patch/drivers/input/misc/ati_remote.c
--- linux-2.6.37-rc6/drivers/input/misc/ati_remote.c	2010-12-16 02:24:48.000000000 +0100
-+++ linux-2.6.37-rc6.patch/drivers/input/misc/ati_remote.c	2010-12-16 12:35:04.454620549 +0100
-@@ -90,6 +90,7 @@
- #include <linux/init.h>
- #include <linux/slab.h>
- #include <linux/module.h>
-+#include <linux/moduleparam.h>
- #include <linux/usb/input.h>
- #include <linux/wait.h>
- #include <linux/jiffies.h>
-@@ -131,6 +132,10 @@
- module_param(debug, int, 0644);
- MODULE_PARM_DESC(debug, "Enable extra debug messages and information");
- 
-+static int keychange;
-+module_param(keychange, int, 0644);
-+MODULE_PARM_DESC(keychange, "Enable support for Keychange remotes");
-+
- static int repeat_filter = FILTER_TIME;
- module_param(repeat_filter, int, 0644);
- MODULE_PARM_DESC(repeat_filter, "Repeat filter time, default = 60 msec");
-@@ -285,6 +290,25 @@
- 	{KIND_FILTERED, 0xf4, 0x2F, EV_KEY, KEY_END, 1},        /* END */
- 	{KIND_FILTERED, 0xf5, 0x30, EV_KEY, KEY_SELECT, 1},     /* SELECT */
- 
-+	/* Coloured keys  */
-+	{KIND_FILTERED, 0xf7, 0x32, EV_KEY, KEY_PLAYCD, 1}, 	/* TXT Rot */
-+	{KIND_FILTERED, 0xf8, 0x33, EV_KEY, KEY_PAUSECD, 1}, 	/* TXT Gr */
-+	{KIND_FILTERED, 0xf9, 0x34, EV_KEY, KEY_PROG3, 1}, 	/* TXT Gelb */
-+	{KIND_FILTERED, 0xfa, 0x35, EV_KEY, KEY_PROG4, 1}, 	/* TXT Blau */
-+
-+	/* More Keys */
-+	{KIND_FILTERED, 0xac, 0x37, EV_KEY, KEY_G, 1}, /* Acquire Image */
-+	{KIND_FILTERED, 0xfe, 0x39, EV_KEY, KEY_H, 1}, /* FULL SCREEN _| */
-+	{KIND_FILTERED, 0xfb, 0x36, EV_KEY, KEY_I, 1}, /* Rename */
-+	{KIND_FILTERED, 0xf1, 0x2c, EV_KEY, KEY_J, 1}, /* TV */
-+	{KIND_FILTERED, 0xf6, 0x31, EV_KEY, KEY_K, 1}, /* Video Desktop */
-+	{KIND_FILTERED, 0xa1, 0x00, EV_KEY, KEY_L, 1},
-+
-+	/* Keys added by torsten at archesoft.de */
-+	{KIND_FILTERED, 0xff, 0x3a, EV_KEY, KEY_M, 1}, /* dvd audio */
-+	{KIND_FILTERED, 0xfc, 0x37, EV_KEY, KEY_N, 1}, /* aquire image */
-+	{KIND_FILTERED, 0xfd, 0x38, EV_KEY, KEY_O, 1}, /* edit image */
-+
- 	{KIND_END, 0x00, 0x00, EV_MAX + 1, 0, 0}
- };
- 
-@@ -409,6 +433,16 @@
- {
- 	int i;
- 
-+	/* If keychange is enabled we undo the keychanges of the remote here */
-+
-+	if (keychange){
-+	    if (d2 & 0x80) {
-+		d1 += 0x80;
-+		d2 -= 0x80;
-+	    }
-+	}
-+
-+
- 	for (i = 0; ati_remote_tbl[i].kind != KIND_END; i++) {
- 		/*
- 		 * Decide if the table entry matches the remote input.
--- a/packages/linux/patches/linux-2.6.39-rc2-062-Pioneer_DVR-216D_failed_xfermode-0.1.patch
+++ b/packages/linux/patches/linux-2.6.39-rc2-062-Pioneer_DVR-216D_failed_xfermode-0.1.patch
@ -1,11 +0,0 @@
-diff -Naur linux-2.6.38-rc5/drivers/ata/libata-core.c linux-2.6.38-rc5.patch/drivers/ata/libata-core.c
--- linux-2.6.38-rc5/drivers/ata/libata-core.c	2011-02-16 04:23:45.000000000 +0100
-+++ linux-2.6.38-rc5.patch/drivers/ata/libata-core.c	2011-02-22 00:57:25.789636966 +0100
-@@ -4139,6 +4139,7 @@
- 	 */
- 	{ "PIONEER DVD-RW  DVRTD08",	"1.00",	ATA_HORKAGE_NOSETXFER },
- 	{ "PIONEER DVD-RW  DVR-212D",	"1.28", ATA_HORKAGE_NOSETXFER },
-+	{ "PIONEER DVD-RW  DVR-216D",	"1.07",	ATA_HORKAGE_NOSETXFER },
- 
- 	/* End Marker */
- 	{ }
--- a/packages/linux/patches/linux-2.6.39-rc2-716_mm-zero_swappiness.patch
+++ b/packages/linux/patches/linux-2.6.39-rc2-716_mm-zero_swappiness.patch
@ -1,17 +0,0 @@
---
- mm/vmscan.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: linux-2.6.37-ck2/mm/vmscan.c
-===================================================================
--- linux-2.6.37-ck2.orig/mm/vmscan.c	2011-01-06 14:04:10.000000000 +1100
-+++ linux-2.6.37-ck2/mm/vmscan.c	2011-02-14 10:11:00.536252000 +1100
-@@ -133,7 +133,7 @@
- /*
-  * From 0 .. 100.  Higher means more swappy.
-  */
-int vm_swappiness = 60;
-+int vm_swappiness;
- long vm_total_pages;	/* The total number of pages which the VM controls */
- 
- static LIST_HEAD(shrinker_list);
--- a/packages/linux/patches/linux-2.6.39-rc3-000_crosscompile.patch
+++ b/packages/linux/patches/linux-2.6.39-rc3-000_crosscompile.patch
--- a/packages/linux/patches/linux-2.6.39-rc3-002_bash_only_feature.patch
+++ b/packages/linux/patches/linux-2.6.39-rc3-002_bash_only_feature.patch
--- a/packages/linux/patches/linux-2.6.39-rc3-003-no_dev_console.patch
+++ b/packages/linux/patches/linux-2.6.39-rc3-003-no_dev_console.patch
--- a/packages/linux/patches/linux-2.6.39-rc3-004_lower_undefined_mode_timeout.patch
+++ b/packages/linux/patches/linux-2.6.39-rc3-004_lower_undefined_mode_timeout.patch
--- a/packages/linux/patches/linux-2.6.39-rc3-005_kconfig_no_timestamp.patch
+++ b/packages/linux/patches/linux-2.6.39-rc3-005_kconfig_no_timestamp.patch
--- a/packages/linux/patches/linux-2.6.39-rc3-006_enable_utf8.patch
+++ b/packages/linux/patches/linux-2.6.39-rc3-006_enable_utf8.patch
--- a/packages/linux/patches/linux-2.6.39-rc3-007_die_floppy_die.patch
+++ b/packages/linux/patches/linux-2.6.39-rc3-007_die_floppy_die.patch
--- a/packages/linux/patches/linux-2.6.39-rc3-008-hda_intel_prealloc_4mb_dmabuffer.patch
+++ b/packages/linux/patches/linux-2.6.39-rc3-008-hda_intel_prealloc_4mb_dmabuffer.patch
--- a/packages/linux/patches/linux-2.6.39-rc3-009_disable_i8042_check_on_apple_mac.patch
+++ b/packages/linux/patches/linux-2.6.39-rc3-009_disable_i8042_check_on_apple_mac.patch
--- a/packages/linux/patches/linux-2.6.39-rc3-050_add_appleir_usb_driver.patch
+++ b/packages/linux/patches/linux-2.6.39-rc3-050_add_appleir_usb_driver.patch
--- a/packages/linux/patches/linux-2.6.39-rc3-052-aureal_remote_quirk-0.1.patch
+++ b/packages/linux/patches/linux-2.6.39-rc3-052-aureal_remote_quirk-0.1.patch
--- a/packages/linux/patches/linux-2.6.39-rc3-053_ati-remote_all_keys_and_keychange-0.1.patch
+++ b/packages/linux/patches/linux-2.6.39-rc3-053_ati-remote_all_keys_and_keychange-0.1.patch
--- a/packages/linux/patches/linux-2.6.39-rc3-054_nuvoton-cir-only-warn-about-unknown-chips.patch
+++ b/packages/linux/patches/linux-2.6.39-rc3-054_nuvoton-cir-only-warn-about-unknown-chips.patch
@ -0,0 +1,89 @@
+diff --git a/drivers/media/rc/nuvoton-cir.c b/drivers/media/rc/nuvoton-cir.c
+index d4d6449..bc5c1e2 100644
+--- a/drivers/media/rc/nuvoton-cir.c
+++ b/drivers/media/rc/nuvoton-cir.c
+@@ -37,8 +37,6 @@
+ 
+ #include "nuvoton-cir.h"
+ 
+-static char *chip_id = "w836x7hg";
+-
+ /* write val to config reg */
+ static inline void nvt_cr_write(struct nvt_dev *nvt, u8 val, u8 reg)
+ {
+@@ -233,6 +231,8 @@ static int nvt_hw_detect(struct nvt_dev *nvt)
+ 	unsigned long flags;
+ 	u8 chip_major, chip_minor;
+ 	int ret = 0;
+	char chip_id[12];
+	bool chip_unknown = false;
+ 
+ 	nvt_efm_enable(nvt);
+ 
+@@ -246,15 +246,39 @@ static int nvt_hw_detect(struct nvt_dev *nvt)
+ 	}
+ 
+ 	chip_minor = nvt_cr_read(nvt, CR_CHIP_ID_LO);
+-	nvt_dbg("%s: chip id: 0x%02x 0x%02x", chip_id, chip_major, chip_minor);
+ 
+-	if (chip_major != CHIP_ID_HIGH ||
+-	    (chip_minor != CHIP_ID_LOW && chip_minor != CHIP_ID_LOW2)) {
+-		nvt_pr(KERN_ERR, "%s: unsupported chip, id: 0x%02x 0x%02x",
+-		       chip_id, chip_major, chip_minor);
+-		ret = -ENODEV;
+	/* these are the known working chip revisions... */
+	switch (chip_major) {
+	case CHIP_ID_HIGH_667:
+		strcpy(chip_id, "w83667hg\0");
+		if (chip_minor != CHIP_ID_LOW_667)
+			chip_unknown = true;
+		break;
+	case CHIP_ID_HIGH_677B:
+		strcpy(chip_id, "w83677hg\0");
+		if (chip_minor != CHIP_ID_LOW_677B2 &&
+		    chip_minor != CHIP_ID_LOW_677B3)
+			chip_unknown = true;
+		break;
+	case CHIP_ID_HIGH_677C:
+		strcpy(chip_id, "w83677hg-c\0");
+		if (chip_minor != CHIP_ID_LOW_677C)
+			chip_unknown = true;
+		break;
+	default:
+		strcpy(chip_id, "w836x7hg\0");
+		chip_unknown = true;
+		break;
+ 	}
+ 
+	/* warn, but still let the driver load, if we don't know this chip */
+	if (chip_unknown)
+		nvt_pr(KERN_WARNING, "%s: unknown chip, id: 0x%02x 0x%02x, "
+		       "it may not work...", chip_id, chip_major, chip_minor);
+	else
+		nvt_dbg("%s: chip id: 0x%02x 0x%02x",
+			chip_id, chip_major, chip_minor);
+
+ 	nvt_efm_disable(nvt);
+ 
+ 	spin_lock_irqsave(&nvt->nvt_lock, flags);
+diff --git a/drivers/media/rc/nuvoton-cir.h b/drivers/media/rc/nuvoton-cir.h
+index 048135e..cc8cee3 100644
+--- a/drivers/media/rc/nuvoton-cir.h
+++ b/drivers/media/rc/nuvoton-cir.h
+@@ -330,9 +330,13 @@ struct nvt_dev {
+ #define EFER_EFM_DISABLE	0xaa
+ 
+ /* Chip IDs found in CR_CHIP_ID_{HI,LO} */
+-#define CHIP_ID_HIGH		0xb4
+-#define CHIP_ID_LOW		0x72
+-#define CHIP_ID_LOW2		0x73
+#define CHIP_ID_HIGH_667	0xa5
+#define CHIP_ID_HIGH_677B	0xb4
+#define CHIP_ID_HIGH_677C	0xc3
+#define CHIP_ID_LOW_667		0x13
+#define CHIP_ID_LOW_677B2	0x72
+#define CHIP_ID_LOW_677B3	0x73
+#define CHIP_ID_LOW_677C	0x33
+ 
+ /* Config regs we need to care about */
+ #define CR_SOFTWARE_RESET	0x02
--- a/packages/linux/patches/linux-2.6.39-rc3-055_nuvoton-cir-enable-CIR-on-w83667hg-chip-variant.patch
+++ b/packages/linux/patches/linux-2.6.39-rc3-055_nuvoton-cir-enable-CIR-on-w83667hg-chip-variant.patch
@ -0,0 +1,63 @@
+diff --git a/drivers/media/rc/nuvoton-cir.c b/drivers/media/rc/nuvoton-cir.c
+index bc5c1e2..5d93384 100644
+--- a/drivers/media/rc/nuvoton-cir.c
+++ b/drivers/media/rc/nuvoton-cir.c
+@@ -291,13 +291,23 @@ static int nvt_hw_detect(struct nvt_dev *nvt)
+ 
+ static void nvt_cir_ldev_init(struct nvt_dev *nvt)
+ {
+-	u8 val;
+	u8 val, psreg, psmask, psval;
+
+	if (nvt->chip_major == CHIP_ID_HIGH_667) {
+		psreg  = CR_MULTIFUNC_PIN_SEL;
+		psmask = MULTIFUNC_PIN_SEL_MASK;
+		psval  = MULTIFUNC_ENABLE_CIR | MULTIFUNC_ENABLE_CIRWB;
+	} else {
+		psreg  = CR_OUTPUT_PIN_SEL;
+		psmask = OUTPUT_PIN_SEL_MASK;
+		psval  = OUTPUT_ENABLE_CIR | OUTPUT_ENABLE_CIRWB;
+	}
+ 
+-	/* output pin selection (Pin95=CIRRX, Pin96=CIRTX1, WB enabled */
+-	val = nvt_cr_read(nvt, CR_OUTPUT_PIN_SEL);
+-	val &= OUTPUT_PIN_SEL_MASK;
+-	val |= (OUTPUT_ENABLE_CIR | OUTPUT_ENABLE_CIRWB);
+-	nvt_cr_write(nvt, val, CR_OUTPUT_PIN_SEL);
+	/* output pin selection: enable CIR, with WB sensor enabled */
+	val = nvt_cr_read(nvt, psreg);
+	val &= psmask;
+	val |= psval;
+	nvt_cr_write(nvt, val, psreg);
+ 
+ 	/* Select CIR logical device and enable */
+ 	nvt_select_logical_dev(nvt, LOGICAL_DEV_CIR);
+diff --git a/drivers/media/rc/nuvoton-cir.h b/drivers/media/rc/nuvoton-cir.h
+index cc8cee3..379795d 100644
+--- a/drivers/media/rc/nuvoton-cir.h
+++ b/drivers/media/rc/nuvoton-cir.h
+@@ -345,6 +345,7 @@ struct nvt_dev {
+ #define CR_CHIP_ID_LO		0x21
+ #define CR_DEV_POWER_DOWN	0x22 /* bit 2 is CIR power, default power on */
+ #define CR_OUTPUT_PIN_SEL	0x27
+#define CR_MULTIFUNC_PIN_SEL	0x2c
+ #define CR_LOGICAL_DEV_EN	0x30 /* valid for all logical devices */
+ /* next three regs valid for both the CIR and CIR_WAKE logical devices */
+ #define CR_CIR_BASE_ADDR_HI	0x60
+@@ -368,10 +369,16 @@ struct nvt_dev {
+ #define CIR_INTR_MOUSE_IRQ_BIT	0x80
+ #define PME_INTR_CIR_PASS_BIT	0x08
+ 
+/* w83677hg CIR pin config */
+ #define OUTPUT_PIN_SEL_MASK	0xbc
+ #define OUTPUT_ENABLE_CIR	0x01 /* Pin95=CIRRX, Pin96=CIRTX1 */
+ #define OUTPUT_ENABLE_CIRWB	0x40 /* enable wide-band sensor */
+ 
+/* w83667hg CIR pin config */
+#define MULTIFUNC_PIN_SEL_MASK	0x1f
+#define MULTIFUNC_ENABLE_CIR	0x80 /* Pin75=CIRRX, Pin76=CIRTX1 */
+#define MULTIFUNC_ENABLE_CIRWB	0x20 /* enable wide-band sensor */
+
+ /* MCE CIR signal length, related on sample period */
+ 
+ /* MCE CIR controller signal length: about 43ms
--- a/packages/linux/patches/linux-2.6.39-rc3-062-Pioneer_DVR-216D_failed_xfermode-0.1.patch
+++ b/packages/linux/patches/linux-2.6.39-rc3-062-Pioneer_DVR-216D_failed_xfermode-0.1.patch
--- a/packages/linux/patches/linux-2.6.39-rc3-321-linux_omap_dss2_fix_SMC_instructions.patch
+++ b/packages/linux/patches/linux-2.6.39-rc3-321-linux_omap_dss2_fix_SMC_instructions.patch
--- a/packages/linux/patches/linux-2.6.39-rc3-322-omap4_pandaboard_fix_dvi_support-0.1.patch
+++ b/packages/linux/patches/linux-2.6.39-rc3-322-omap4_pandaboard_fix_dvi_support-0.1.patch
--- a/packages/linux/patches/linux-2.6.39-rc3-716_mm-zero_swappiness.patch
+++ b/packages/linux/patches/linux-2.6.39-rc3-716_mm-zero_swappiness.patch
--- a/packages/network/SABnzbd/config/sabnzbd.config
+++ b/packages/network/SABnzbd/config/sabnzbd.config
@ -1,216 +0,0 @@
-__version__ = 18
-[misc]
-    queue_complete = ""
-    https_port = 8081
-    folder_rename = 1
-    allow_64bit_tools = 1
-    rss_rate = 60
-    https_key = ""
-    cleanup_list = ,
-    cache_limit = 128M
-    par_option = ""
-    web_color = gold
-    replace_spaces = 0
-    web_color2 = "gold"
-    dirscan_speed = 5
-    enable_filejoin = 1
-    create_group_folders = 0
-    api_key = @API_KEY@
-    no_penalties = 0
-    bandwidth_limit = 0
-    dirscan_dir = /storage/downloads/watch/
-    disable_api_key = 0
-    email_to = ,
-    password = ""
-    permissions = ""
-    auto_disconnect = 1
-    enable_date_sorting = 0
-    replace_dots = 0
-    movie_sort_extra = -cd%1
-    ionice = -c2 -n4
-    enable_unzip = 1
-    download_free = 1G
-    port = 8080
-    email_dir = ""
-    email_full = 0
-    log_dir = logs
-    admin_dir = admin
-    nzb_backup_dir = ""
-    tv_sort_countries = 1
-    date_categories = tv,
-    ssl_type = v23
-    date_sort_string = ""
-    schedlines = ,
-    host = 0.0.0.0
-    ignore_samples = 2
-    enable_tsjoin = 1
-    auto_browser = 0
-    pause_on_post_processing = 1
-    enable_unrar = 1
-    email_account = ""
-    email_server = ""
-    config_lock = 0
-    api_warnings = 1
-    tv_sort_string = ""
-    dirscan_priority = 0
-    username = ""
-    download_dir = /storage/downloads/incoming/
-    size_limit = ""
-    enable_par_cleanup = 1
-    safe_postproc = 1
-    cache_dir = cache
-    complete_dir = /storage/downloads/
-    replace_illegal = 1
-    par2_multicore = 0
-    warned_old_queue = 0
-    language = us-en
-    check_new_rel = 0
-    enable_https = 0
-    no_dupes = 0
-    top_only = 1
-    quick_check = 1
-    movie_sort_string = ""
-    email_from = ""
-    movie_extra_folder = 0
-    dirscan_script = ""
-    email_endjob = 0
-    tv_categories = ,
-    unpack_check = 1
-    login_realm = SABnzbd
-    send_group = 0
-    refresh_rate = 0
-    movie_categories = movies,
-    script_dir = ""
-    email_pwd = ""
-    ignore_wrong_unrar = 0
-    nice = ""
-    enable_movie_sorting = 0
-    https_cert = ""
-    web_dir2 = ""
-    fail_on_crc = 0
-    auto_sort = 0
-    dirscan_opts = 3
-    web_dir = smpl
-    queue_complete_pers = 0
-    enable_tv_sorting = 0
-    folder_max_length = 256
-[logging]
-    max_log_size = 1282880
-    log_level = 0
-    log_backups = 1
-    enable_cherrypy_logging = 0
-[newzbin]
-    username = ""
-    https = 1
-    bookmark_rate = 60
-    bookmarks = 0
-    password = ""
-    unbookmark = 1
-[nzbmatrix]
-    username = ""
-    apikey = ""
-[categories]
-    [[misc]]
-        priority = -100
-        pp = ""
-        name = misc
-        script = Default
-        newzbin = Misc
-        dir = Misc
-    [[tv]]
-        priority = -100
-        pp = ""
-        name = tv
-        script = Default
-        newzbin = TV
-        dir = TV
-    [[unknown]]
-        priority = -100
-        pp = ""
-        name = unknown
-        script = Default
-        newzbin = Unknown
-        dir = Unknown
-    [[resources]]
-        priority = -100
-        pp = ""
-        name = resources
-        script = Default
-        newzbin = Resources
-        dir = Resources
-    [[apps]]
-        priority = -100
-        pp = ""
-        name = apps
-        script = Default
-        newzbin = Apps
-        dir = Apps
-    [[movies]]
-        priority = -100
-        pp = ""
-        name = movies
-        script = Default
-        newzbin = Movies
-        dir = Movies
-    [[consoles]]
-        priority = -100
-        pp = ""
-        name = consoles
-        script = Default
-        newzbin = Consoles
-        dir = Consoles
-    [[books]]
-        priority = -100
-        pp = ""
-        name = books
-        script = Default
-        newzbin = Books
-        dir = Books
-    [[games]]
-        priority = -100
-        pp = ""
-        name = games
-        script = Default
-        newzbin = Games
-        dir = Games
-    [[anime]]
-        priority = -100
-        pp = ""
-        name = anime
-        script = Default
-        newzbin = Anime
-        dir = Anime
-    [[music]]
-        priority = -100
-        pp = ""
-        name = music
-        script = Default
-        newzbin = Music
-        dir = Music
-    [[pda]]
-        priority = -100
-        pp = ""
-        name = pda
-        script = Default
-        newzbin = PDA
-        dir = PDA
-    [[emulation]]
-        priority = -100
-        pp = ""
-        name = emulation
-        script = Default
-        newzbin = Emulation
-        dir = Emulation
-[servers]
-    [[localhost:119]]
-        username = ""
-        enable = 1
-        name = localhost:119
-        fillserver = 0
-        connections = 8
-        ssl = 0
-        host = localhost
-        timeout = 120
-        password = ""
-        optional = 0
-        port = 119
--- a/packages/network/connman/install
+++ b/packages/network/connman/install
@ -29,6 +29,9 @@ mkdir -p $INSTALL/etc
  cp $PKG_DIR/config/services $INSTALL/etc
  cp $PKG_DIR/config/resolv.conf $INSTALL/etc

+mkdir -p $INSTALL/etc/connman
+  cp $PKG_BUILD/src/main.conf $INSTALL/etc/connman
+
 mkdir -p $INSTALL/etc/dbus-1/system.d
  cp $PKG_BUILD/src/connman.conf $INSTALL/etc/dbus-1/system.d

--- a/packages/network/connman/meta
+++ b/packages/network/connman/meta
@ -19,13 +19,13 @@
 ################################################################################

 PKG_NAME="connman"
-PKG_VERSION="0.72"
+PKG_VERSION="160a24b"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.connman.net"
-PKG_URL="http://www.kernel.org/pub/linux/network/connman/$PKG_NAME-$PKG_VERSION.tar.bz2"
-#PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
+#PKG_URL="http://www.kernel.org/pub/linux/network/connman/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="glib dbus udev iptables wpa_supplicant ntp netstatus"
 PKG_BUILD_DEPENDS="toolchain glib dbus udev iptables"
 PKG_PRIORITY="optional"
--- a/packages/python/web/SABnzbd/config/sabnzbd-http.service
+++ b/packages/python/web/SABnzbd/config/sabnzbd-http.service
@ -4,7 +4,7 @@
 <name replace-wildcards="yes">SABnzbd Server on %h</name>
  <service>
   <type>_http._tcp</type>
-   <port>8080</port>
+   <port>8081</port>
   <txt-record>path=/index.html</txt-record>
  </service>
 </service-group>
--- a/packages/python/web/SABnzbd/config/sabnzbd-https.service
+++ b/packages/python/web/SABnzbd/config/sabnzbd-https.service
@ -4,7 +4,7 @@
 <name replace-wildcards="yes">SABnzbd Server on %h (secured)</name>
  <service>
   <type>_http._tcp</type>
-   <port>8081</port>
+   <port>8082</port>
   <txt-record>path=/index.html</txt-record>
  </service>
 </service-group>
--- a/packages/python/web/SABnzbd/init.d/57_SABnzbd
+++ b/packages/python/web/SABnzbd/init.d/57_SABnzbd
@ -22,31 +22,21 @@
 #
 # runlevels: openelec, textmode

-
 (
  if [ -f /var/config/settings.conf ]; then
    . /var/config/settings.conf

    if [ "$SABNZBD_START" = "true" ]; then

-      wait_for_network
-
-      progress "Starting SABnzbd Newsgroup downloader daemon"
-
+      mkdir -p $HOME/.sabnzbd
      mkdir -p $HOME/downloads
      mkdir -p $HOME/downloads/incoming
      mkdir -p $HOME/downloads/watch

-      if [ ! -f $HOME/.sabnzbd/sabnzbd.conf ]; then
-        mkdir -p $HOME/.sabnzbd
-        cp /usr/lib/SABnzbd/sabnzbd.config $HOME/.sabnzbd/sabnzbd.conf
+      wait_for_network

-      # create api key
-        API_KEY=`cat /dev/urandom |od -N16 -tx1 |cut -c8- |tr -d ' \n'`
-        sed -e "s,@API_KEY@,$API_KEY,g" -i $HOME/.sabnzbd/sabnzbd.conf
-      fi
-
-      python /usr/lib/SABnzbd/SABnzbd.py -d -f $HOME/.sabnzbd/sabnzbd.conf -l 0 > /dev/null 2>&1
+      progress "Starting SABnzbd Newsgroup downloader daemon"
+        python /usr/lib/SABnzbd/SABnzbd.py -d -f $HOME/.sabnzbd/sabnzbd.conf -l 0 > /dev/null 2>&1
    fi
  fi
 )&
--- a/packages/python/web/SABnzbd/install
+++ b/packages/python/web/SABnzbd/install
@ -24,7 +24,6 @@

 mkdir -p $INSTALL/usr/lib/$1
  cp -PR $PKG_BUILD/* $INSTALL/usr/lib/$1
-  cp $PKG_DIR/config/sabnzbd.config $INSTALL/usr/lib/$1

 mkdir -p $INSTALL/etc/avahi/services
  cp $PKG_DIR/config/sabnzbd-http.service $INSTALL/etc/avahi/services
--- a/packages/python/web/SABnzbd/meta
+++ b/packages/python/web/SABnzbd/meta
@ -19,19 +19,19 @@
 ################################################################################

 PKG_NAME="SABnzbd"
-PKG_VERSION="0.6.0Beta4"
+PKG_VERSION="0.6.0RC2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://sabnzbd.org/"
 #PKG_URL="$SOURCEFORGE_SRC/sabnzbdplus/${PKG_NAME}-${PKG_VERSION}-src.tar.gz"
-PKG_URL="$SOURCEFORGE_SRC/sabnzbdplus/sabnzbdplus-beta/sabnzbd-0.6.0Beta4/${PKG_NAME}-${PKG_VERSION}-src.tar.gz"
-PKG_DEPENDS="Cheetah pyOpenSSL yenc unrar unzip par2cmdline"
-PKG_BUILD_DEPENDS="toolchain"
+PKG_URL="$SOURCEFORGE_SRC/sabnzbdplus/sabnzbdplus-beta/sabnzbd-${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}-src.tar.gz"
+PKG_DEPENDS="Python Cheetah pyOpenSSL yenc unrar unzip par2cmdline"
+PKG_BUILD_DEPENDS="toolchain Python"
 PKG_PRIORITY="optional"
 PKG_SECTION="plugins"
-PKG_SHORTDESC="SABnzbd: makes Usenet as simple and streamlined as possible by automating everything we can."
-PKG_LONGDESC="SABnzbd makes Usenet as simple and streamlined as possible by automating everything we can. All you have to do is add an .nzb. SABnzbd takes over from there, where it will be automatically downloaded, verified, repaired, extracted and filed away with zero human interaction."
+PKG_SHORTDESC="SABnzbd makes Usenet as simple and streamlined as possible by automating everything we can."
+PKG_LONGDESC="SABnzbd makes Usenet as simple and streamlined as possible by automating everything we can. All you have to do is add a .nzb file. SABnzbd+ takes over from there, where it will be automatically downloaded, verified, repaired, extracted and filed away with zero human interaction."
 PKG_IS_ADDON="no"

 PKG_AUTORECONF="no"
--- a/packages/python/web/SABnzbd/patches/SABnzbd-0.6.0RC2-001_defaults-0.1.patch
+++ b/packages/python/web/SABnzbd/patches/SABnzbd-0.6.0RC2-001_defaults-0.1.patch
@ -0,0 +1,33 @@
+diff -Naur SABnzbd-0.6.0RC2/sabnzbd/constants.py SABnzbd-0.6.0RC2.patch/sabnzbd/constants.py
+--- SABnzbd-0.6.0RC2/sabnzbd/constants.py	2011-04-10 16:06:27.000000000 +0200
+++ SABnzbd-0.6.0RC2.patch/sabnzbd/constants.py	2011-04-16 21:49:52.858788377 +0200
+@@ -70,8 +70,8 @@
+ DB_HISTORY_NAME = 'history%s.db' % DB_HISTORY_VERSION
+ DB_QUEUE_NAME = 'queue%s.db' % DB_QUEUE_VERSION
+ 
+-DEF_DOWNLOAD_DIR = 'Downloads/incomplete'
+-DEF_COMPLETE_DIR = 'Downloads/complete'
+DEF_DOWNLOAD_DIR = '/storage/downloads/incoming/'
+DEF_COMPLETE_DIR = '/storage/downloads/'
+ DEF_CACHE_DIR    = 'cache'
+ DEF_ADMIN_DIR    = 'admin'
+ DEF_LOG_DIR      = 'logs'
+@@ -83,12 +83,12 @@
+ DEF_STDINTF      = 'smpl'
+ DEF_SKIN_COLORS  = {'smpl':'white', 'classic':'darkblue', 'mobile':'light', 'plush' : 'gold'}
+ DEF_MAIN_TMPL    = 'templates/main.tmpl'
+-DEF_INI_FILE     = 'sabnzbd.ini'
+-DEF_HOST         = 'localhost'
+-DEF_PORT_WIN     = 8080
+-DEF_PORT_UNIX    = 8080
+-DEF_PORT_WIN_SSL = 9090
+-DEF_PORT_UNIX_SSL= 9090
+DEF_INI_FILE     = 'sabnzbd.conf'
+DEF_HOST         = '0.0.0.0'
+DEF_PORT_WIN     = 8081
+DEF_PORT_UNIX    = 8081
+DEF_PORT_WIN_SSL = 9081
+DEF_PORT_UNIX_SSL= 9081
+ DEF_WORKDIR      = 'sabnzbd'
+ DEF_LOG_FILE     = 'sabnzbd.log'
+ DEF_LOG_ERRFILE  = 'sabnzbd.error.log'
--- a/packages/python/web/SABnzbd/patches/SABnzbd-0.6.0RC2-002-remove_host_settings-0.1.patch
+++ b/packages/python/web/SABnzbd/patches/SABnzbd-0.6.0RC2-002-remove_host_settings-0.1.patch
@ -0,0 +1,70 @@
+diff -Naur SABnzbd-0.6.0RC2/interfaces/Classic/templates/config_general.tmpl SABnzbd-0.6.0RC2.patch/interfaces/Classic/templates/config_general.tmpl
+--- SABnzbd-0.6.0RC2/interfaces/Classic/templates/config_general.tmpl	2011-04-16 23:15:34.940298239 +0200
+++ SABnzbd-0.6.0RC2.patch/interfaces/Classic/templates/config_general.tmpl	2011-04-16 23:21:11.140812740 +0200
+@@ -13,16 +13,6 @@
+ 
+ <legend>$T('webServer')</legend>
+ <i>$T('restartRequired')</i><br/><br/>
+-<strong>$T('opt-host'):</strong><br>
+-$T('explain-host')<br>
+-<input type="text" name="host" value="$host">
+-<br>
+-<br>
+-<strong>$T('opt-port'):</strong><br>
+-$T('explain-port')<br>
+-<input type="text" name="port" value="$port">
+-<br>
+-<br>
+ <strong>$T('opt-web_dir'):</strong><br>
+ $T('explain-web_dir')<br>
+ <select name="web_dir">
+diff -Naur SABnzbd-0.6.0RC2/interfaces/Plush/templates/config_general.tmpl SABnzbd-0.6.0RC2.patch/interfaces/Plush/templates/config_general.tmpl
+--- SABnzbd-0.6.0RC2/interfaces/Plush/templates/config_general.tmpl	2011-04-16 23:15:34.954297968 +0200
+++ SABnzbd-0.6.0RC2.patch/interfaces/Plush/templates/config_general.tmpl	2011-04-16 23:23:32.496084161 +0200
+@@ -14,26 +14,6 @@
+         </div>
+         <fieldset class="component-group-list">
+             <div class="field-pair">
+-                <label class="nocheck clearfix" for="host">
+-                    <span class="component-title">$T('opt-host')</span>
+-	                <input type="text" name="host" id="host" value="$host"/>
+-                </label>
+-                <label class="nocheck clearfix">
+-                    <span class="component-title">&nbsp;</span>
+-                    <span class="component-desc">$T('explain-host')</span>
+-                </label>
+-            </div>
+-            <div class="field-pair alt">
+-                <label class="nocheck clearfix" for="port">
+-                    <span class="component-title">$T('opt-port')</span>
+-				    <input type="text" name="port" id="port" size=8 value="$port"/>
+-                </label>
+-                <label class="nocheck clearfix">
+-                    <span class="component-title">&nbsp;</span>
+-                    <span class="component-desc">$T('explain-port')</span>
+-                </label>
+-            </div>
+-            <div class="field-pair">
+                 <label class="nocheck clearfix" for="username">
+                     <span class="component-title">$T('opt-web_username')</span>
+ 				    <input type="text" name="username" id="username" value="$username"/>
+diff -Naur SABnzbd-0.6.0RC2/interfaces/smpl/templates/config_general.tmpl SABnzbd-0.6.0RC2.patch/interfaces/smpl/templates/config_general.tmpl
+--- SABnzbd-0.6.0RC2/interfaces/smpl/templates/config_general.tmpl	2011-04-16 23:15:34.944298160 +0200
+++ SABnzbd-0.6.0RC2.patch/interfaces/smpl/templates/config_general.tmpl	2011-04-16 23:22:14.877582554 +0200
+@@ -5,16 +5,6 @@
+ <fieldset class="EntryFieldSet">
+ <legend>$T('webServer') <i>($T('restartRequired'))</i></legend>
+ <hr />
+-			<label for "host" class="label">$T('opt-host'):</label>
+-			<input type="text" name="host" value="$host">
+-			<span class="tips">$T('explain-host')</span>
+-		<br class="clear" />
+-
+-			<label for "port" class="label">$T('opt-port'):</label>
+-			<input type="text" name="port" value="$port">
+-			<span class="tips">$T('explain-port')</span>
+-		<br class="clear" />
+-
+         <label for "userinterface" class="label">$T('opt-web_dir'):</label>
+ 
+         <select name="web_dir" id="webdir" class="select">
--- a/packages/python/web/Sick-Beard/init.d/60_sickbeard
+++ b/packages/python/web/Sick-Beard/init.d/60_sickbeard
@ -0,0 +1,43 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#      Copyright (C) 2011 Anthony Nash (nash.ant@gmail.com)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+# Starting Sickbeard downloader daemon
+#
+# runlevels: openelec, textmode
+
+(
+  if [ -f /var/config/settings.conf ]; then
+    . /var/config/settings.conf
+
+    if [ "$SABNZBD_START" = "true" ]; then
+
+      mkdir -p /var/run
+      mkdir -p $HOME/.sickbeard
+
+      wait_for_network
+
+      progress "Starting sickbeard downloader daemon"
+      python /usr/lib/SickBeard/SickBeard.py --daemon \
+                                             --pidfile=/var/run/sickbeard.pid \
+                                             --datadir $HOME/.sickbeard
+    fi
+  fi
+)&
--- a/packages/python/web/Sick-Beard/install
+++ b/packages/python/web/Sick-Beard/install
@ -0,0 +1,28 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#      Copyright (C) 2011 Anthony Nash (nash.ant@gmail.com)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+mkdir -p $INSTALL/usr/lib/SickBeard
+  cp -PR $PKG_BUILD/* $INSTALL/usr/lib/SickBeard
+
--- a/packages/python/web/Sick-Beard/meta
+++ b/packages/python/web/Sick-Beard/meta
@ -0,0 +1,37 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#      Copyright (C) 2011 Anthony Nash (nash.ant@gmail.com)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="Sick-Beard"
+PKG_VERSION="0f076f4"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="OSS"
+PKG_SITE="https://github.com/midgetspy/Sick-Beard"
+PKG_URL="$OPENELEC_SRC/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
+PKG_DEPENDS="Python Cheetah SABnzbd"
+PKG_BUILD_DEPENDS="toolchain Python"
+PKG_PRIORITY="optional"
+PKG_SECTION="plugins"
+PKG_SHORTDESC="Sick-beard: automated TV show downloading."
+PKG_LONGDESC="Sick-beard: automated TV show downloading."
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"
--- a/packages/python/web/Sick-Beard/patches/Sick-Beard-0f076f4-000_branding-0.5.patch
+++ b/packages/python/web/Sick-Beard/patches/Sick-Beard-0f076f4-000_branding-0.5.patch
@ -0,0 +1,116 @@
+diff -Naur Sick-Beard-0f076f4/data/css/default.css Sick-Beard-0f076f4.patch/data/css/default.css
+--- Sick-Beard-0f076f4/data/css/default.css	2011-04-16 17:14:02.059365807 +0200
+++ Sick-Beard-0f076f4.patch/data/css/default.css	2011-04-16 17:47:20.371757075 +0200
+@@ -281,16 +281,6 @@
+ background-color:#000;
+ color:#fff;
+ }
+-#donate {
+-line-height:1em;
+-background: #57442B;
+-float: right;
+-}
+-#donate a,#donate a:hover {
+-background-color:#57442B;
+-border:0;
+-padding:4px 15px 0px;
+-}
+ #content {
+     min-height: 100px;
+     background: #fff;
+@@ -361,4 +351,4 @@
+     text-shadow: 1px 1px 0 rgba(255,255,255,0.3);
+     font-size: 1em;
+ }
+-div.ui-pnotify { min-width: 340px; max-width: 550px; width: auto !important;}
+\ Kein Zeilenumbruch am Dateiende.
+div.ui-pnotify { min-width: 340px; max-width: 550px; width: auto !important;}
+diff -Naur Sick-Beard-0f076f4/data/interfaces/default/config_general.tmpl Sick-Beard-0f076f4.patch/data/interfaces/default/config_general.tmpl
+--- Sick-Beard-0f076f4/data/interfaces/default/config_general.tmpl	2011-04-16 17:14:02.055365889 +0200
+++ Sick-Beard-0f076f4.patch/data/interfaces/default/config_general.tmpl	2011-04-16 18:04:59.879961265 +0200
+@@ -40,18 +40,6 @@
+                         </div>
+                         
+                         <div class="field-pair">
+-                            <input type="checkbox" name="version_notify" id="version_notify" #if $sickbeard.VERSION_NOTIFY then "checked=\"checked\"" else ""#/>
+-                            <label class="clearfix" for="version_notify">
+-                                <span class="component-title">Check for Update</span>
+-                                <span class="component-desc">Show notification about updates for Sick Beard if available.</span>
+-                            </label>
+-                            <label class="nocheck clearfix">
+-                                <span class="component-title">&nbsp;</span>
+-                                <span class="component-desc">Checking for updates runs on startup and every 12 hours.</span>
+-                            </label>
+-                        </div>
+-
+-                        <div class="field-pair">
+                             <label class="nocheck clearfix" for="log_dir">
+                                 <span class="component-title">Logging Directory</span>
+                                 <input type="text" name="log_dir" id="log_dir" value="$sickbeard.LOG_DIR" size="35" />
+diff -Naur Sick-Beard-0f076f4/data/interfaces/default/config.tmpl Sick-Beard-0f076f4.patch/data/interfaces/default/config.tmpl
+--- Sick-Beard-0f076f4/data/interfaces/default/config.tmpl	2011-04-16 17:14:02.054365910 +0200
+++ Sick-Beard-0f076f4.patch/data/interfaces/default/config.tmpl	2011-04-16 17:21:20.366435826 +0200
+@@ -16,17 +16,10 @@
+     <tr><td class="infoTableHeader">SB Arguments: </td><td class="infoTableCell">$sickbeard.MY_ARGS</td></tr>
+     <tr><td class="infoTableHeader">SB Web Root: </td><td class="infoTableCell">$sickbeard.WEB_ROOT</td></tr>
+     <tr><td class="infoTableHeader">Python Version: </td><td class="infoTableCell">$sys.version[:120]</td></tr>
+-    <tr style="border-top: 1px dotted #666666;"><td class="infoTableHeader">Homepage </td><td class="infoTableCell"><a href="http://www.sickbeard.com/">http://www.sickbeard.com/</a></td></tr>
+-    <tr><td class="infoTableHeader">Forums </td><td class="infoTableCell"><a href="http://sickbeard.com/forums/">http://sickbeard.com/forums/</a></td></tr>
+-    <tr><td class="infoTableHeader">Source </td><td class="infoTableCell"><a href="https://github.com/midgetspy/Sick-Beard/">https://github.com/midgetspy/Sick-Beard/</a></td></tr>
+-    <tr><td class="infoTableHeader">Bug Tracker &amp;<br/> Windows Builds </td><td class="infoTableCell"><a href="http://code.google.com/p/sickbeard/">http://code.google.com/p/sickbeard/</a></td></tr>
+-    <tr><td class="infoTableHeader">Internet Relay Chat </td><td class="infoTableCell"><a href="irc://irc.freenode.net/#sickbeard"><i>#sickbeard</i> on <i>irc.freenode.net</i></a></td></tr>
+    <tr style="border-top: 1px dotted #666666;"><td class="infoTableHeader">Homepage </td><td class="infoTableCell"><a href="http://www.openelec.tv">http://www.openelec.tv</a></td></tr>
+    <tr><td class="infoTableHeader">Forums </td><td class="infoTableCell"><a href="http://www.openelec.tv/forum/">http://www.openelec.tv/forum/</a></td></tr>
+    <tr><td class="infoTableHeader">Internet Relay Chat </td><td class="infoTableCell"><a href="irc://irc.freenode.net/#openelec"><i>#openelec</i> on <i>irc.freenode.net</i></a></td></tr>
+ </table>
+ </div>
+ 
+-<table class="infoTable" cellspacing="1" border="0" cellpadding="0"><tr>
+-    <td><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=JA8M7VDY89SQ4" onclick="window.open(this.href); return false;"><img src="$sbRoot/images/paypal/btn_donateCC_LG.gif" alt="[donate]" /></a></td>
+-    <td>Sickbeard is free, but you can contribute by giving a <b><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=JA8M7VDY89SQ4" onclick="window.open(this.href); return false;">donation</a></b>.</td>
+-</tr></table>
+-
+ #include $os.path.join($sickbeard.PROG_DIR, "data/interfaces/default/inc_bottom.tmpl")
+diff -Naur Sick-Beard-0f076f4/data/interfaces/default/inc_top.tmpl Sick-Beard-0f076f4.patch/data/interfaces/default/inc_top.tmpl
+--- Sick-Beard-0f076f4/data/interfaces/default/inc_top.tmpl	2011-04-16 17:14:02.055365889 +0200
+++ Sick-Beard-0f076f4.patch/data/interfaces/default/inc_top.tmpl	2011-04-16 17:51:40.232667081 +0200
+@@ -147,19 +147,6 @@
+ </head>
+ 
+ <body>
+-#if $sickbeard.NEWEST_VERSION_STRING:
+-<div id="upgrade-notification">
+-    <div>
+-        <span class="notify-text">$sickbeard.NEWEST_VERSION_STRING</span>
+-    </div>
+-</div>
+-<div id="header-fix"></div>
+-#end if
+-<div id="header">
+-    <a name="top"></a>
+-    <span id="logo"><a href="$sbRoot/home/" title="Sick Beard homepage"><img alt="Sick Beard" src="$sbRoot/images/sickbeard_small.png" width="150" /></a></span>
+-    <span id="versiontext">alpha $sickbeard.version.SICKBEARD_VERSION</span>
+-</div>
+ <ul id="MainMenu" class="sf-menu">
+             <li id="NAVsystem" class="first"><a href="#" class="navIcon"><img src="$sbRoot/images/menu/system18.png" alt="" width="18" height="18" /></a>
+                 <ul>
+@@ -197,7 +184,6 @@
+                         <li><a href="$sbRoot/errorlogs/viewlog"><img src="$sbRoot/images/menu/viewlog16.png" alt="" width="16" height="16" />View Log</a></li>
+                 </ul>
+             </li>
+-            <li id="donate"><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=JA8M7VDY89SQ4" onclick="window.open(this.href); return false;"><img src="$sbRoot/images/paypal/btn_donate_LG.gif" alt="[donate]" /></a></li>
+ </ul>
+ #if $varExists('submenu'):
+ <div id="SubMenu">
+diff -Naur Sick-Beard-0f076f4/sickbeard/__init__.py Sick-Beard-0f076f4.patch/sickbeard/__init__.py
+--- Sick-Beard-0f076f4/sickbeard/__init__.py	2011-04-16 17:14:02.038366239 +0200
+++ Sick-Beard-0f076f4.patch/sickbeard/__init__.py	2011-04-16 18:13:07.293414961 +0200
+@@ -446,7 +446,7 @@
+ 
+         QUALITY_DEFAULT = check_setting_int(CFG, 'General', 'quality_default', SD)
+         STATUS_DEFAULT = check_setting_int(CFG, 'General', 'status_default', SKIPPED)
+-        VERSION_NOTIFY = check_setting_int(CFG, 'General', 'version_notify', 1)
+        VERSION_NOTIFY = check_setting_int(CFG, 'General', 'version_notify', 0)
+         SEASON_FOLDERS_FORMAT = check_setting_str(CFG, 'General', 'season_folders_format', 'Season %02d')
+         SEASON_FOLDERS_DEFAULT = bool(check_setting_int(CFG, 'General', 'season_folders_default', 0))
+ 
--- a/packages/python/web/Sick-Beard/patches/Sick-Beard-0f076f4-001_set_default_port_to_8082-0.1.patch
+++ b/packages/python/web/Sick-Beard/patches/Sick-Beard-0f076f4-001_set_default_port_to_8082-0.1.patch
@ -0,0 +1,56 @@
+diff -Naur Sick-Beard-0f076f4/autoProcessTV/autoProcessTV.cfg.sample Sick-Beard-0f076f4.patch/autoProcessTV/autoProcessTV.cfg.sample
+--- Sick-Beard-0f076f4/autoProcessTV/autoProcessTV.cfg.sample	2011-04-16 15:57:38.000000000 +0200
+++ Sick-Beard-0f076f4.patch/autoProcessTV/autoProcessTV.cfg.sample	2011-04-16 16:52:05.332606512 +0200
+@@ -1,6 +1,6 @@
+ [SickBeard]
+ host=localhost
+-port=8081
+port=8082
+ username=
+ password=
+-web_root=
+\ Kein Zeilenumbruch am Dateiende.
+web_root=
+diff -Naur Sick-Beard-0f076f4/data/interfaces/default/config_general.tmpl Sick-Beard-0f076f4.patch/data/interfaces/default/config_general.tmpl
+--- Sick-Beard-0f076f4/data/interfaces/default/config_general.tmpl	2011-04-16 15:57:38.000000000 +0200
+++ Sick-Beard-0f076f4.patch/data/interfaces/default/config_general.tmpl	2011-04-16 16:53:18.753081978 +0200
+@@ -95,7 +95,7 @@
+                             </label>
+                             <label class="nocheck clearfix">
+                                 <span class="component-title">&nbsp;</span>
+-                                <span class="component-desc">Web port that Sick Beard should listen on (eg. 8081)</span>
+                                <span class="component-desc">Web port that Sick Beard should listen on (eg. 8082)</span>
+                             </label>
+                         </div>
+ 
+diff -Naur Sick-Beard-0f076f4/sickbeard/__init__.py Sick-Beard-0f076f4.patch/sickbeard/__init__.py
+--- Sick-Beard-0f076f4/sickbeard/__init__.py	2011-04-16 15:57:38.000000000 +0200
+++ Sick-Beard-0f076f4.patch/sickbeard/__init__.py	2011-04-16 16:51:40.750117126 +0200
+@@ -393,12 +393,12 @@
+             logger.log(u"!!! No log folder, logging to screen only!", logger.ERROR)
+ 
+         try:
+-            WEB_PORT = check_setting_int(CFG, 'General', 'web_port', 8081)
+            WEB_PORT = check_setting_int(CFG, 'General', 'web_port', 8082)
+         except:
+-            WEB_PORT = 8081
+            WEB_PORT = 8082
+ 
+         if WEB_PORT < 21 or WEB_PORT > 65535:
+-            WEB_PORT = 8081
+            WEB_PORT = 8082
+ 
+         WEB_HOST = check_setting_str(CFG, 'General', 'web_host', '0.0.0.0')
+         WEB_IPV6 = bool(check_setting_int(CFG, 'General', 'web_ipv6', 0))
+diff -Naur Sick-Beard-0f076f4/sickbeard/webserveInit.py Sick-Beard-0f076f4.patch/sickbeard/webserveInit.py
+--- Sick-Beard-0f076f4/sickbeard/webserveInit.py	2011-04-16 15:57:38.000000000 +0200
+++ Sick-Beard-0f076f4.patch/sickbeard/webserveInit.py	2011-04-16 16:52:50.786662601 +0200
+@@ -24,7 +24,7 @@
+ from sickbeard.webserve import WebInterface
+ 
+ def initWebServer(options = {}):
+-        options.setdefault('port',      8081)
+        options.setdefault('port',      8082)
+         options.setdefault('host',      '0.0.0.0')
+         options.setdefault('log_dir',   None)
+         options.setdefault('username',    '')
--- a/packages/python/web/Sick-Beard/patches/Sick-Beard-0f076f4-002_enable_xbmc_support-0.1.patch
+++ b/packages/python/web/Sick-Beard/patches/Sick-Beard-0f076f4-002_enable_xbmc_support-0.1.patch
@ -0,0 +1,33 @@
+diff -Naur Sick-Beard-0f076f4/sickbeard/__init__.py Sick-Beard-0f076f4.patch/sickbeard/__init__.py
+--- Sick-Beard-0f076f4/sickbeard/__init__.py	2011-04-16 16:57:52.784398169 +0200
+++ Sick-Beard-0f076f4.patch/sickbeard/__init__.py	2011-04-16 17:04:12.103546012 +0200
+@@ -190,12 +190,12 @@
+ NZBGET_CATEGORY = None
+ NZBGET_HOST = None
+ 
+-USE_XBMC = False
+USE_XBMC = True
+ XBMC_NOTIFY_ONSNATCH = False
+ XBMC_NOTIFY_ONDOWNLOAD = False
+ XBMC_UPDATE_LIBRARY = False
+ XBMC_UPDATE_FULL = False
+-XBMC_HOST = ''
+XBMC_HOST = '127.0.0.1:8080'
+ XBMC_USERNAME = None
+ XBMC_PASSWORD = None
+ 
+@@ -528,12 +528,12 @@
+         NZBGET_CATEGORY = check_setting_str(CFG, 'NZBget', 'nzbget_category', 'tv')
+         NZBGET_HOST = check_setting_str(CFG, 'NZBget', 'nzbget_host', '')
+ 
+-        USE_XBMC = bool(check_setting_int(CFG, 'XBMC', 'use_xbmc', 0)) 
+        USE_XBMC = bool(check_setting_int(CFG, 'XBMC', 'use_xbmc', 1)) 
+         XBMC_NOTIFY_ONSNATCH = bool(check_setting_int(CFG, 'XBMC', 'xbmc_notify_onsnatch', 0))
+         XBMC_NOTIFY_ONDOWNLOAD = bool(check_setting_int(CFG, 'XBMC', 'xbmc_notify_ondownload', 0))
+         XBMC_UPDATE_LIBRARY = bool(check_setting_int(CFG, 'XBMC', 'xbmc_update_library', 0))
+         XBMC_UPDATE_FULL = bool(check_setting_int(CFG, 'XBMC', 'xbmc_update_full', 0))
+-        XBMC_HOST = check_setting_str(CFG, 'XBMC', 'xbmc_host', '')
+        XBMC_HOST = check_setting_str(CFG, 'XBMC', 'xbmc_host', '127.0.0.1:8080')
+         XBMC_USERNAME = check_setting_str(CFG, 'XBMC', 'xbmc_username', '')
+         XBMC_PASSWORD = check_setting_str(CFG, 'XBMC', 'xbmc_password', '')
+ 
--- a/packages/python/web/Sick-Beard/patches/Sick-Beard-0f076f4-005_setup_SABnzbd_host-0.1.patch
+++ b/packages/python/web/Sick-Beard/patches/Sick-Beard-0f076f4-005_setup_SABnzbd_host-0.1.patch
@ -0,0 +1,21 @@
+diff -Naur Sick-Beard-0f076f4/sickbeard/__init__.py Sick-Beard-0f076f4.patch/sickbeard/__init__.py
+--- Sick-Beard-0f076f4/sickbeard/__init__.py	2011-04-16 22:38:48.449071968 +0200
+++ Sick-Beard-0f076f4.patch/sickbeard/__init__.py	2011-04-16 22:52:23.704291427 +0200
+@@ -184,7 +184,7 @@
+ SAB_PASSWORD = None
+ SAB_APIKEY = None
+ SAB_CATEGORY = None
+-SAB_HOST = ''
+SAB_HOST = '127.0.0.1:8081'
+ 
+ NZBGET_PASSWORD = None
+ NZBGET_CATEGORY = None
+@@ -522,7 +522,7 @@
+         SAB_PASSWORD = check_setting_str(CFG, 'SABnzbd', 'sab_password', '')
+         SAB_APIKEY = check_setting_str(CFG, 'SABnzbd', 'sab_apikey', '')
+         SAB_CATEGORY = check_setting_str(CFG, 'SABnzbd', 'sab_category', 'tv')
+-        SAB_HOST = check_setting_str(CFG, 'SABnzbd', 'sab_host', '')
+        SAB_HOST = check_setting_str(CFG, 'SABnzbd', 'sab_host', '127.0.0.1:8081')
+ 
+         NZBGET_PASSWORD = check_setting_str(CFG, 'NZBget', 'nzbget_password', 'tegbzn6789')
+         NZBGET_CATEGORY = check_setting_str(CFG, 'NZBget', 'nzbget_category', 'tv')
--- a/packages/security/gnutls/meta
+++ b/packages/security/gnutls/meta
@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="gnutls"
-PKG_VERSION="2.12.1"
+PKG_VERSION="2.10.5"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"
--- a/packages/sysutils/busybox/config/busybox.conf
+++ b/packages/sysutils/busybox/config/busybox.conf
@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.18.4
-# Sun Apr  3 16:13:37 2011
+# Tue Apr 12 14:24:15 2011
 #
 CONFIG_HAVE_DOT_CONFIG=y

@ -720,19 +720,19 @@ CONFIG_FTPGET=y
 CONFIG_FTPPUT=y
 CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y
 CONFIG_HOSTNAME=y
-# CONFIG_HTTPD is not set
-# CONFIG_FEATURE_HTTPD_RANGES is not set
-# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set
-# CONFIG_FEATURE_HTTPD_SETUID is not set
-# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
-# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
-# CONFIG_FEATURE_HTTPD_CGI is not set
-# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
-# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
-# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
-# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
-# CONFIG_FEATURE_HTTPD_PROXY is not set
-# CONFIG_FEATURE_HTTPD_GZIP is not set
+CONFIG_HTTPD=y
+CONFIG_FEATURE_HTTPD_RANGES=y
+CONFIG_FEATURE_HTTPD_USE_SENDFILE=y
+CONFIG_FEATURE_HTTPD_SETUID=y
+CONFIG_FEATURE_HTTPD_BASIC_AUTH=y
+CONFIG_FEATURE_HTTPD_AUTH_MD5=y
+CONFIG_FEATURE_HTTPD_CGI=y
+CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR=y
+CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y
+CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y
+CONFIG_FEATURE_HTTPD_ERROR_PAGES=y
+CONFIG_FEATURE_HTTPD_PROXY=y
+CONFIG_FEATURE_HTTPD_GZIP=y
 CONFIG_IFCONFIG=y
 CONFIG_FEATURE_IFCONFIG_STATUS=y
 # CONFIG_FEATURE_IFCONFIG_SLIP is not set
--- a/packages/sysutils/busybox/config/httpd.conf
+++ b/packages/sysutils/busybox/config/httpd.conf
@ -0,0 +1,46 @@
+# httpd.conf has the following format:
+#
+# H:/serverroot     # define the server root. It will override -h
+# A:172.20.         # Allow address from 172.20.0.0/16
+# A:10.0.0.0/25     # Allow any address from 10.0.0.0-10.0.0.127
+# A:10.0.0.0/255.255.255.128  # Allow any address that previous set
+# A:127.0.0.1       # Allow local loopback connections
+# D:*               # Deny from other IP connections
+# E404:/path/e404.html # /path/e404.html is the 404 (not found) error page
+# I:index.html      # Show index.html when a directory is requested
+#
+# P:/url:[http://]hostname[:port]/new/path
+#                   # When /urlXXXXXX is requested, reverse proxy
+#                   # it to http://hostname[:port]/new/pathXXXXXX
+#
+# /cgi-bin:foo:bar  # Require user foo, pwd bar on urls starting with /cgi-bin/
+# /adm:admin:setup  # Require user admin, pwd setup on urls starting with /adm/
+# /adm:toor:PaSsWd  # or user toor, pwd PaSsWd on urls starting with /adm/
+# .au:audio/basic   # additional mime type for audio.au files
+# *.php:/path/php   # run xxx.php through an interpreter
+#
+# A/D may be as a/d or allow/deny - only first char matters.
+# Deny/Allow IP logic:
+#  - Default is to allow all (Allow all (A:*) is a no-op).
+#  - Deny rules take precedence over allow rules.
+#  - "Deny all" rule (D:*) is applied last.
+#
+# Example:
+#   1. Allow only specified addresses
+#     A:172.20          # Allow any address that begins with 172.20.
+#     A:10.10.          # Allow any address that begins with 10.10.
+#     A:127.0.0.1       # Allow local loopback connections
+#     D:*               # Deny from other IP connections
+#
+#   2. Only deny specified addresses
+#     D:1.2.3.        # deny from 1.2.3.0 - 1.2.3.255
+#     D:2.3.4.        # deny from 2.3.4.0 - 2.3.4.255
+#     A:*             # (optional line added for clarity)
+#
+
+H:/usr/www                   # define the server root. It will override -h
+A:*                          # Allow address from all ip's
+E404:/usr/www/error/404.html # /path/e404.html is the 404 (not found) error page
+I:index.html                 # Show index.html when a directory is requested
+
+*.php:/usr/bin/php-cgi
--- a/packages/sysutils/busybox/init.d/55_httpd
+++ b/packages/sysutils/busybox/init.d/55_httpd
@ -0,0 +1,29 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+#
+# start httpd daemon
+#
+# runlevels: openelec, textmode
+
+(
+  progress "Starting HTTP daemon"
+    httpd -p 80
+)&
--- a/packages/sysutils/busybox/install
+++ b/packages/sysutils/busybox/install
@ -44,6 +44,7 @@ USER_PWD="`$ROOT/$TOOLCHAIN/bin/cryptpw $USER_PASSWORD`"

  mkdir -p $INSTALL/etc
    cp $PKG_DIR/config/profile $INSTALL/etc
+    cp $PKG_DIR/config/httpd.conf $INSTALL/etc

  # /etc/fstab is needed by...
    touch $INSTALL/etc/fstab
@ -62,3 +63,10 @@ USER_PWD="`$ROOT/$TOOLCHAIN/bin/cryptpw $USER_PASSWORD`"

  # add user modprobe.d dir
    mkdir -p $INSTALL/usr/config/modprobe.d
+
+  # add webroot
+    mkdir -p $INSTALL/usr/www
+      echo "It works" > $INSTALL/usr/www/index.html
+
+    mkdir -p $INSTALL/usr/www/error
+      echo "404" > $INSTALL/usr/www/error/404.html
--- a/packages/sysutils/dbus/meta
+++ b/packages/sysutils/dbus/meta
@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="dbus"
-PKG_VERSION="1.4.6"
+PKG_VERSION="1.4.8"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
--- a/packages/sysutils/dbus/patches/dbus-1.4.8-remove_pie.patch
+++ b/packages/sysutils/dbus/patches/dbus-1.4.8-remove_pie.patch
--- a/packages/sysutils/ntfs-3g_ntfsprogs/build
+++ b/packages/sysutils/ntfs-3g_ntfsprogs/build
@ -33,5 +33,9 @@ cd $PKG_BUILD
            --disable-library \
            --enable-posix-acls \
            --disable-mtab \
+            --disable-ntfsprogs \
+            --disable-crypto \
+            --with-fuse=external \
+            --without-uuid \

 make
--- a/packages/sysutils/ntfs-3g_ntfsprogs/install
+++ b/packages/sysutils/ntfs-3g_ntfsprogs/install
--- a/packages/sysutils/ntfs-3g_ntfsprogs/meta
+++ b/packages/sysutils/ntfs-3g_ntfsprogs/meta
@ -18,8 +18,8 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################

-PKG_NAME="ntfs-3g"
-PKG_VERSION="2011.1.15"
+PKG_NAME="ntfs-3g_ntfsprogs"
+PKG_VERSION="2011.4.12"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
@ -29,8 +29,8 @@ PKG_DEPENDS="fuse"
 PKG_BUILD_DEPENDS="toolchain fuse"
 PKG_PRIORITY="optional"
 PKG_SECTION="system"
-PKG_SHORTDESC="ntfs-3g: NTFS-3G Read/Write userspace driver"
-PKG_LONGDESC="The NTFS-3G driver is an open source, freely available NTFS driver for Linux with read and write support. It provides safe and fast handling of the Windows XP, Windows Server 2003, Windows 2000 and Windows Vista file systems."
+PKG_SHORTDESC="ntfs-3g_ntfsprogs: NTFS-3G Read/Write userspace driver"
+PKG_LONGDESC="The NTFS-3G_ntfsprogs driver is an open source, freely available NTFS driver for Linux with read and write support. It provides safe and fast handling of the Windows XP, Windows Server 2003, Windows 2000 and Windows Vista file systems."
 PKG_IS_ADDON="no"

 PKG_AUTORECONF="yes"
--- a/packages/sysutils/remote/eventlircd/evmap/03_046e_5577.evmap
+++ b/packages/sysutils/remote/eventlircd/evmap/03_046e_5577.evmap
@ -1,50 +0,0 @@
-# Emprex BTX remote control
-
-KEY_SLEEP          = KEY_POWER
-KEY_RECORD         = KEY_RECORD
-KEY_PAUSE          = KEY_PAUSE
-KEY_STOPCD         = KEY_STOP
-KEY_REWIND         = KEY_REWIND
-KEY_PLAY           = KEY_PLAY
-KEY_FASTFORWARD    = KEY_FASTFORWARD
-KEY_PREVIOUSSONG   = KEY_PREVIOUS
-KEY_NEXTSONG       = KEY_NEXT
-KEY_BACK           = KEY_EXIT
-KEY_MEDIA          = KEY_PROG1
-KEY_PROPS          = KEY_INFO
-KEY LEFT           = KEY_LEFT
-KEY_RIGHT          = KEY_RIGHT
-KEY_UP             = KEY_UP
-KEY_DOWN           = KEY_DOWN
-KEY_ENTER          = KEY_OK
-KEY_VOLUMEUP       = KEY_VOLUMEUP
-KEY_VOLUMEDOWN     = KEY_VOLUMEDOWN
-KEY_MUTE           = KEY_MUTE
-KEY_CHANNELUP      = KEY_CHANNELUP
-KEY_CHANNELDOWN    = KEY_CHANNELDOWN
-KEY_TV2            = KEY_EPG
-KEY_PROGRAM        = KEY_SUBTITLE
-KEY_TV             = KEY_TV                  # This key is not mapped in XBMC
-KEY_MENU           = KEY_MENU
-KEY_MP3            = KEY_AUDIO
-KEY_CAMERA         = KEY_CAMERA
-KEY_VIDEO          = KEY_VIDEO
-KEY_RADIO          = KEY_ZOOM                # Remap because we need the zoom key
-KEY_1              = KEY_NUMERIC_1
-KEY_2              = KEY_NUMERIC_2
-KEY_3              = KEY_NUMERIC_3
-KEY_4              = KEY_NUMERIC_4
-KEY_5              = KEY_NUMERIC_5
-KEY_6              = KEY_NUMERIC_6
-KEY_7              = KEY_NUMERIC_7
-KEY_8              = KEY_NUMERIC_8
-KEY_9              = KEY_NUMERIC_9
-KEY_0              = KEY_NUMERIC_0
-shift+KEY_8        = KEY_NUMERIC_STAR
-shift+KEY_3        = KEY_NUMERIC_POUND
-KEY_ESC            = KEY_DELETE
-KEY_TEXT           = KEY_TEXT
-KEY_RED            = KEY_RED
-KEY_GREEN          = KEY_GREEN
-KEY_YELLOW         = KEY_YELLOW
-KEY_BLUE           = KEY_BLUE
--- a/packages/sysutils/remote/eventlircd/evmap/03_9022_d660.evmap
+++ b/packages/sysutils/remote/eventlircd/evmap/03_9022_d660.evmap
@ -0,0 +1,43 @@
+# TiVii S660 Remote
+# Bus=0003 Vendor=9022 Product=d660 Version=0000
+
+ KEY_POWER        = KEY_POWER       # Power
+
+ KEY_1            = KEY_NUMERIC_1   # 1
+ KEY_2            = KEY_NUMERIC_2   # 2
+ KEY_3            = KEY_NUMERIC_3   # 3
+ KEY_4            = KEY_NUMERIC_4   # 4
+ KEY_5            = KEY_NUMERIC_5   # 5
+ KEY_6            = KEY_NUMERIC_6   # 6
+ KEY_7            = KEY_NUMERIC_7   # 7
+ KEY_8            = KEY_NUMERIC_8   # 8
+ KEY_9            = KEY_NUMERIC_9   # 9
+ KEY_0            = KEY_NUMERIC_0   # 0
+
+ KEY_UP           = KEY_UP          # Up Arrow
+ KEY_DOWN         = KEY_DOWN        # Down Arrow
+ KEY_LEFT         = KEY_LEFT        # Left Arrow
+ KEY_RIGHT        = KEY_RIGHT       # Right Arrow
+
+ KEY_OK           = KEY_OK          # Ok
+ KEY_BACK         = KEY_EXIT        # Back
+ KEY_ESC          = KEY_CLEAR       # Clear
+
+ KEY_VOLUMEDOWN   = KEY_VOLUMEDOWN  # Vol -
+ KEY_VOLUMEUP     = KEY_VOLUMEUP    # Vol +
+ KEY_MUTE         = KEY_MUTE        # Mute
+ KEY_CHANNELUP    = KEY_CHANNELUP   # CH/PG up
+ KEY_CHANNELDOWN  = KEY_CHANNELDOWN # CH/PG down
+
+ KEY_PLAYPAUSE    = KEY_PLAY        # Play/Pause
+ KEY_RECORD       = KEY_RECORD      # Record
+ KEY_REWIND       = KEY_REWIND      # Rev
+ KEY_FASTFORWARD  = KEY_FASTFORWARD # Fwd
+---
+ KEY_STOPCD       = KEY_STOP        # Stop
+ KEY_NEXTSONG     = KEY_NEXT        # Next
+ KEY_PREVIOUSSONG = KEY_PREVIOUS    # Prev
+
+ KEY_COMPOSE      = KEY_INFO        # Info/EPG
+ KEY_G            = KEY_EPG         # Guide
+
--- a/packages/sysutils/remote/eventlircd/evmap/ircore.evmap
+++ b/packages/sysutils/remote/eventlircd/evmap/ircore.evmap
@ -33,4 +33,5 @@ KEY_MP3          = KEY_AUDIO
 KEY_TEXT         = KEY_TEXT
 KEY_EPG          = KEY_EPG

-KEY_ENTER        = KEY_OK
+KEY_ENTER        = KEY_OK
+KEY_PLAYPAUSE    = KEY_PLAY
--- a/packages/sysutils/remote/eventlircd/evmap/03_0766_0204.evmap
+++ b/packages/sysutils/remote/eventlircd/evmap/03_0766_0204.evmap
@ -1,3 +1,10 @@
+# Emprex BTX remote control
+# 046e:5577 BTC Emprex 2
+# 046e:5578 BTC Emprex
+# 04f2:0618 Chicony Wireless
+# 0766:0204 Topseed Cyberlink
+# 1784:0004 Topseed 2 RF Combo
+
 KEY_1            = KEY_NUMERIC_1   # 1
 KEY_2            = KEY_NUMERIC_2   # 2
 KEY_3            = KEY_NUMERIC_3   # 3
@ -8,39 +15,55 @@
 KEY_8            = KEY_NUMERIC_8   # 8
 KEY_9            = KEY_NUMERIC_9   # 9
 KEY_0            = KEY_NUMERIC_0   # 0
+ shift+KEY_8      = KEY_NUMERIC_STAR # *
+ shift+KEY_3      = KEY_NUMERIC_POUND # #
+
 KEY_UP           = KEY_UP          # Up Arrow
 KEY_DOWN         = KEY_DOWN        # Down Arrow
 KEY_LEFT         = KEY_LEFT        # Left Arrow
 KEY_RIGHT        = KEY_RIGHT       # Right Arrow
 KEY_ENTER        = KEY_OK          # Enter & Ok
- KEY_DELETE       = KEY_CLEAR       # Clear
+ KEY_DELETE       = KEY_DELETE      # Delete/Clear
+ KEY_BACK         = KEY_EXIT        # BACK
+ KEY_ESC          = KEY_DELETE      # Delete/Clear
+
 KEY_HOME         = KEY_HOME        # Home
 KEY_SLEEP        = KEY_POWER       # Power
- KEY_DVD          = KEY_DVD         # DVD/VCD
- KEY_MP3          = KEY_MP3         # Music
- KEY_MEDIA        = KEY_MEDIA       # Pictures
- KEY_VIDEO        = KEY_VIDEO       # Videos
- KEY_TV           = KEY_TV          # Live TV
- KEY_RECORD       = KEY_RECORD      # Record
- KEY_RADIO        = KEY_RADIO       # Radio
- KEY_AUDIO        = KEY_AUDIO       # SAP
- KEY_TEXT         = KEY_TEXT        # Teletext/CC
- KEY_LAST         = KEY_LAST        # Last CH
- KEY_SUBTITLE     = KEY_SUBTITLE    # Subtitle
- KEY_LANGUAGE     = KEY_LANGUAGE    # Language
- KEY_ANGLE        = KEY_ANGLE       # Angle
- KEY_BACK         = KEY_BACK        # BACK
- KEY_PROPS        = KEY_INFO        # Info/EPG
- KEY_MENU         = KEY_MENU        # DVD Menu
+
 KEY_VOLUMEDOWN   = KEY_VOLUMEDOWN  # Vol -
 KEY_VOLUMEUP     = KEY_VOLUMEUP    # Vol +
 KEY_MUTE         = KEY_MUTE        # Mute
 KEY_CHANNELUP    = KEY_CHANNELUP   # CH/PG up
 KEY_CHANNELDOWN  = KEY_CHANNELDOWN # CH/PG down
 KEY_PLAY         = KEY_PLAY        # Play
+ KEY_RECORD       = KEY_RECORD      # Record
 KEY_REWIND       = KEY_REWIND      # Rev
 KEY_PAUSE        = KEY_PAUSE       # Pause
 KEY_FASTFORWARD  = KEY_FASTFORWARD # Fwd
 KEY_PREVIOUSSONG = KEY_PREVIOUS    # Prev
 KEY_STOPCD       = KEY_STOP        # Stop
 KEY_NEXTSONG     = KEY_NEXT        # Next
+
+ KEY_DVD          = KEY_DVD         # DVD/VCD
+ KEY_MP3          = KEY_AUDIO       # Music
+ KEY_MEDIA        = KEY_CAMERA      # Pictures
+ KEY_VIDEO        = KEY_VIDEO       # Videos
+ KEY_RADIO        = KEY_ZOOM        # Radio # Remap because we need the zoom key
+ KEY_AUDIO        = KEY_AUDIO       # SAP
+ KEY_TV           = KEY_TV          # Live TV
+ KEY_TV2          = KEY_EPG         # EPG
+
+ KEY_TEXT         = KEY_TEXT        # Teletext/CC
+ KEY_LAST         = KEY_LAST        # Last CH
+ KEY_SUBTITLE     = KEY_SUBTITLE    # Subtitle
+ KEY_PROGRAM      = KEY_SUBTITLE    # Program # remapped to Subtitle
+
+ KEY_LANGUAGE     = KEY_LANGUAGE    # Language
+ KEY_ANGLE        = KEY_ANGLE       # Angle
+ KEY_PROPS        = KEY_INFO        # Info/EPG
+ KEY_MENU         = KEY_DVD         # DVD Menu
+
+ KEY_RED          = KEY_RED         # Red
+ KEY_GREEN        = KEY_GREEN       # Green
+ KEY_YELLOW       = KEY_YELLOW      # Yellow
+ KEY_BLUE         = KEY_BLUE        # Blue
--- a/packages/sysutils/remote/eventlircd/udev.d/98-eventlircd.rules
+++ b/packages/sysutils/remote/eventlircd/udev.d/98-eventlircd.rules
@ -85,7 +85,23 @@ ENV{ID_VENDOR_ID}=="0419", ENV{ID_MODEL_ID}=="0001", \

 ENV{ID_VENDOR_ID}=="046e", ENV{ID_MODEL_ID}=="5577", \
  ENV{eventlircd_enable}="true", \
-  ENV{eventlircd_evmap}="03_$env{ID_VENDOR_ID}_$env{ID_MODEL_ID}.evmap"
+  ENV{eventlircd_evmap}="topseed.evmap"
+
+ENV{ID_VENDOR_ID}=="046e", ENV{ID_MODEL_ID}=="5578", \
+  ENV{eventlircd_enable}="true", \
+  ENV{eventlircd_evmap}="topseed.evmap"
+
+ENV{ID_VENDOR_ID}=="04f2", ENV{ID_MODEL_ID}=="0618", \
+  ENV{eventlircd_enable}="true", \
+  ENV{eventlircd_evmap}="topseed.evmap"
+
+ENV{ID_VENDOR_ID}=="0766", ENV{ID_MODEL_ID}=="0204", \
+  ENV{eventlircd_enable}="true", \
+  ENV{eventlircd_evmap}="topseed.evmap"
+
+ENV{ID_VENDOR_ID}=="1784", ENV{ID_MODEL_ID}=="0004", \
+  ENV{eventlircd_enable}="true", \
+  ENV{eventlircd_evmap}="topseed.evmap"

 ENV{ID_VENDOR_ID}=="05a4", ENV{ID_MODEL_ID}=="9881", \
  ENV{eventlircd_enable}="true", \
@ -103,11 +119,11 @@ ENV{ID_VENDOR_ID}=="0755", ENV{ID_MODEL_ID}=="2626", \
  ENV{eventlircd_enable}="true", \
  ENV{eventlircd_evmap}="03_$env{ID_VENDOR_ID}_$env{ID_MODEL_ID}.evmap"

-ENV{ID_VENDOR_ID}=="0766", ENV{ID_MODEL_ID}=="0204", \
+ENV{ID_VENDOR_ID}=="147a", ENV{ID_MODEL_ID}=="e02d", \
  ENV{eventlircd_enable}="true", \
  ENV{eventlircd_evmap}="03_$env{ID_VENDOR_ID}_$env{ID_MODEL_ID}.evmap"

-ENV{ID_VENDOR_ID}=="147a", ENV{ID_MODEL_ID}=="e02d", \
+ENV{ID_VENDOR_ID}=="9022", ENV{ID_MODEL_ID}=="d660", \
  ENV{eventlircd_enable}="true", \
  ENV{eventlircd_evmap}="03_$env{ID_VENDOR_ID}_$env{ID_MODEL_ID}.evmap"

--- a/packages/toolchain/math/mpfr/patches/mpfr-3.0.1-allpatches_20110412.patch
+++ b/packages/toolchain/math/mpfr/patches/mpfr-3.0.1-allpatches_20110412.patch
@ -0,0 +1,137 @@
+diff -Naurd mpfr-3.0.1-a/PATCHES mpfr-3.0.1-b/PATCHES
+--- mpfr-3.0.1-a/PATCHES	2011-04-12 10:50:02.000000000 +0000
+++ mpfr-3.0.1-b/PATCHES	2011-04-12 10:50:02.000000000 +0000
+@@ -0,0 +1 @@
+asin_exprange
+diff -Naurd mpfr-3.0.1-a/VERSION mpfr-3.0.1-b/VERSION
+--- mpfr-3.0.1-a/VERSION	2011-04-04 10:19:18.000000000 +0000
+++ mpfr-3.0.1-b/VERSION	2011-04-12 10:50:02.000000000 +0000
+@@ -1 +1 @@
+-3.0.1
+3.0.1-p1
+diff -Naurd mpfr-3.0.1-a/asin.c mpfr-3.0.1-b/asin.c
+--- mpfr-3.0.1-a/asin.c	2011-04-04 10:19:18.000000000 +0000
+++ mpfr-3.0.1-b/asin.c	2011-04-12 10:50:02.000000000 +0000
+@@ -63,11 +63,14 @@
+ 
+   compared = mpfr_cmp_ui (xp, 1);
+ 
+  MPFR_SAVE_EXPO_MARK (expo);
+
+   if (MPFR_UNLIKELY (compared >= 0))
+     {
+       mpfr_clear (xp);
+       if (compared > 0)                  /* asin(x) = NaN for |x| > 1 */
+         {
+          MPFR_SAVE_EXPO_FREE (expo);
+           MPFR_SET_NAN (asin);
+           MPFR_RET_NAN;
+         }
+@@ -80,13 +83,11 @@
+               inexact = -mpfr_const_pi (asin, MPFR_INVERT_RND(rnd_mode));
+               MPFR_CHANGE_SIGN (asin);
+             }
+-          mpfr_div_2ui (asin, asin, 1, rnd_mode); /* May underflow */
+-          return inexact;
+          mpfr_div_2ui (asin, asin, 1, rnd_mode);
+         }
+     }
+-
+-  MPFR_SAVE_EXPO_MARK (expo);
+-
+  else
+    {
+   /* Compute exponent of 1 - ABS(x) */
+   mpfr_ui_sub (xp, 1, xp, MPFR_RNDD);
+   MPFR_ASSERTD (MPFR_GET_EXP (xp) <= 0);
+@@ -115,6 +116,7 @@
+   inexact = mpfr_set (asin, xp, rnd_mode);
+ 
+   mpfr_clear (xp);
+    }
+ 
+   MPFR_SAVE_EXPO_FREE (expo);
+   return mpfr_check_range (asin, inexact, rnd_mode);
+diff -Naurd mpfr-3.0.1-a/mpfr.h mpfr-3.0.1-b/mpfr.h
+--- mpfr-3.0.1-a/mpfr.h	2011-04-04 10:19:18.000000000 +0000
+++ mpfr-3.0.1-b/mpfr.h	2011-04-12 10:50:02.000000000 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 0
+ #define MPFR_VERSION_PATCHLEVEL 1
+-#define MPFR_VERSION_STRING "3.0.1"
+#define MPFR_VERSION_STRING "3.0.1-p1"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.0.1-a/tests/tasin.c mpfr-3.0.1-b/tests/tasin.c
+--- mpfr-3.0.1-a/tests/tasin.c	2011-04-04 10:19:17.000000000 +0000
+++ mpfr-3.0.1-b/tests/tasin.c	2011-04-12 10:50:02.000000000 +0000
+@@ -219,6 +219,49 @@
+   mpfr_clear (y);
+ }
+ 
+static void
+reduced_expo_range (void)
+{
+  mpfr_exp_t emin, emax;
+  mpfr_t x, y, ex_y;
+  int inex, ex_inex;
+  unsigned int flags, ex_flags;
+
+  emin = mpfr_get_emin ();
+  emax = mpfr_get_emax ();
+
+  mpfr_inits2 (4, x, y, ex_y, (mpfr_ptr) 0);
+  mpfr_set_str (x, "-0.1e1", 2, MPFR_RNDN);
+
+  mpfr_set_emin (1);
+  mpfr_set_emax (1);
+  mpfr_clear_flags ();
+  inex = mpfr_asin (y, x, MPFR_RNDA);
+  flags = __gmpfr_flags;
+  mpfr_set_emin (emin);
+  mpfr_set_emax (emax);
+
+  mpfr_set_str (ex_y, "-0.1101e1", 2, MPFR_RNDN);
+  ex_inex = -1;
+  ex_flags = MPFR_FLAGS_INEXACT;
+
+  if (SIGN (inex) != ex_inex || flags != ex_flags ||
+      ! mpfr_equal_p (y, ex_y))
+    {
+      printf ("Error in reduced_expo_range\non x = ");
+      mpfr_dump (x);
+      printf ("Expected y = ");
+      mpfr_out_str (stdout, 2, 0, ex_y, MPFR_RNDN);
+      printf ("\n         inex = %d, flags = %u\n", ex_inex, ex_flags);
+      printf ("Got      y = ");
+      mpfr_out_str (stdout, 2, 0, y, MPFR_RNDN);
+      printf ("\n         inex = %d, flags = %u\n", SIGN (inex), flags);
+      exit (1);
+    }
+
+  mpfr_clears (x, y, ex_y, (mpfr_ptr) 0);
+}
+
+ int
+ main (void)
+ {
+@@ -226,6 +269,7 @@
+ 
+   special ();
+   special_overflow ();
+  reduced_expo_range ();
+ 
+   test_generic (2, 100, 15);
+ 
+diff -Naurd mpfr-3.0.1-a/version.c mpfr-3.0.1-b/version.c
+--- mpfr-3.0.1-a/version.c	2011-04-04 10:19:18.000000000 +0000
+++ mpfr-3.0.1-b/version.c	2011-04-12 10:50:02.000000000 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.0.1";
+  return "3.0.1-p1";
+ }
--- a/packages/network/transmission/build
+++ b/packages/network/transmission/build
--- a/packages/network/transmission/init.d/58_transmission
+++ b/packages/network/transmission/init.d/58_transmission
--- a/packages/network/transmission/install
+++ b/packages/network/transmission/install
--- a/packages/network/transmission/meta
+++ b/packages/network/transmission/meta
--- a/packages/x11/driver/xf86-video-intel/meta
+++ b/packages/x11/driver/xf86-video-intel/meta
@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="xf86-video-intel"
-PKG_VERSION="2.14.902"
+PKG_VERSION="2.15.0"
 PKG_REV="1"
 PKG_ARCH="i386 x86_64"
 PKG_LICENSE="OSS"
--- a/packages/x11/driver/xf86-video-nvidia/meta
+++ b/packages/x11/driver/xf86-video-nvidia/meta
@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="xf86-video-nvidia"
-PKG_VERSION="270.30"
+PKG_VERSION="270.41.03"
 PKG_REV="1"
 PKG_ARCH="i386 x86_64"
 PKG_LICENSE="nonfree"
--- a/packages/x11/driver/xf86-video-nvidia/unpack
+++ b/packages/x11/driver/xf86-video-nvidia/unpack
@ -34,7 +34,7 @@ sh $SOURCES/$1/$NV_PKG --extract-only --target $BUILD/$PKG_NAME-$PKG_VERSION

 echo "### Applying upstream patches ###"

-for patch in `ls $PKG_DIR/patches.upstream`; do
-  cat $PKG_DIR/patches.upstream/$patch | patch -d \
-    `echo $PKG_BUILD | cut -f1 -d\ ` -p1
+for patch in `ls $PKG_DIR/patches.upstream/*.patch`; do
+  cat $patch | patch -d \
+    `echo $BUILD/$PKG_NAME-$PKG_VERSION | cut -f1 -d\ ` -p1
 done
--- a/packages/x11/xserver/xorg-server/meta
+++ b/packages/x11/xserver/xorg-server/meta
@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="xorg-server"
-PKG_VERSION="1.10.0.902"
+PKG_VERSION="1.10.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
--- a/packages/x11/xserver/xorg-server/patches/xorg-server-1.10.0.902-05_pkg_config.patch
+++ b/packages/x11/xserver/xorg-server/patches/xorg-server-1.10.0.902-05_pkg_config.patch
--- a/packages/x11/xserver/xorg-server/patches/xorg-server-1.10.0.902-10_cache_xkbcomp_output_for_fast_start_up.patch
+++ b/packages/x11/xserver/xorg-server/patches/xorg-server-1.10.0.902-10_cache_xkbcomp_output_for_fast_start_up.patch
--- a/packages/x11/xserver/xorg-server/patches/xorg-server-1.10.0.902-11_use_sloppy_heuristic_first_for_initial_mode.patch
+++ b/packages/x11/xserver/xorg-server/patches/xorg-server-1.10.0.902-11_use_sloppy_heuristic_first_for_initial_mode.patch
--- a/packages/x11/xserver/xorg-server/patches/xorg-server-1.10.0.902-13_nouveau.patch
+++ b/packages/x11/xserver/xorg-server/patches/xorg-server-1.10.0.902-13_nouveau.patch
--- a/packages/x11/xserver/xorg-server/patches/xorg-server-1.10.0.902-14_nvidia_fglrx_autodetect.patch
+++ b/packages/x11/xserver/xorg-server/patches/xorg-server-1.10.0.902-14_nvidia_fglrx_autodetect.patch
--- a/packages/x11/xserver/xorg-server/patches/xorg-server-1.10.0.902-20_extra_modelines_fromxorg.patch
+++ b/packages/x11/xserver/xorg-server/patches/xorg-server-1.10.0.902-20_extra_modelines_fromxorg.patch
--- a/packages/x11/xserver/xorg-server/patches/xorg-server-1.10.0.902-21_x11_nonroot-vesa.patch
+++ b/packages/x11/xserver/xorg-server/patches/xorg-server-1.10.0.902-21_x11_nonroot-vesa.patch
--- a/packages/x11/xserver/xorg-server/patches/xorg-server-1.10.0.902-22_do_not_zap_xserver.patch
+++ b/packages/x11/xserver/xorg-server/patches/xorg-server-1.10.0.902-22_do_not_zap_xserver.patch
--- a/packages/x11/xserver/xorg-server/patches/xorg-server-1.10.0.902-25_less_acpi_brokenness.patch
+++ b/packages/x11/xserver/xorg-server/patches/xorg-server-1.10.0.902-25_less_acpi_brokenness.patch
--- a/projects/ATV/linux/linux.i386.conf
+++ b/projects/ATV/linux/linux.i386.conf
@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Linux/i386 2.6.38.2 Kernel Configuration
+# Linux/i386 2.6.39-rc3 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@ -45,7 +45,6 @@ CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_X86_32_SMP=y
 CONFIG_X86_HT=y
-CONFIG_X86_TRAMPOLINE=y
 CONFIG_X86_32_LAZY_GS=y
 CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx"
 CONFIG_KTIME_SCALAR=y
@ -79,6 +78,7 @@ CONFIG_POSIX_MQUEUE=y
 CONFIG_POSIX_MQUEUE_SYSCTL=y
 CONFIG_BSD_PROCESS_ACCT=y
 # CONFIG_BSD_PROCESS_ACCT_V3 is not set
+# CONFIG_FHANDLE is not set
 # CONFIG_TASKSTATS is not set
 # CONFIG_AUDIT is not set
 CONFIG_HAVE_GENERIC_HARDIRQS=y
@ -87,13 +87,11 @@ CONFIG_HAVE_GENERIC_HARDIRQS=y
 # IRQ subsystem
 #
 CONFIG_GENERIC_HARDIRQS=y
-# CONFIG_GENERIC_HARDIRQS_NO_DEPRECATED is not set
 CONFIG_HAVE_SPARSE_IRQ=y
 CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_IRQ_SHOW=y
 CONFIG_GENERIC_PENDING_IRQ=y
-# CONFIG_AUTO_IRQ_AFFINITY is not set
-# CONFIG_IRQ_PER_CPU is not set
-# CONFIG_HARDIRQS_SW_RESEND is not set
+CONFIG_IRQ_FORCED_THREADING=y
 # CONFIG_SPARSE_IRQ is not set

 #
@ -117,6 +115,7 @@ CONFIG_CGROUP_NS=y
 # CONFIG_CGROUP_CPUACCT is not set
 CONFIG_RESOURCE_COUNTERS=y
 # CONFIG_CGROUP_MEM_RES_CTLR is not set
+# CONFIG_CGROUP_PERF is not set
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_RT_GROUP_SCHED=y
@ -298,7 +297,6 @@ CONFIG_MPENTIUMM=y
 # CONFIG_MCORE2 is not set
 # CONFIG_MATOM is not set
 # CONFIG_X86_GENERIC is not set
-CONFIG_X86_CPU=y
 CONFIG_X86_INTERNODE_CACHE_SHIFT=6
 CONFIG_X86_CMPXCHG=y
 CONFIG_CMPXCHG_LOCAL=y
@ -420,8 +418,6 @@ CONFIG_CMDLINE="fastboot root=/dev/ram0 rdinit=/init"
 #
 # Power management and ACPI options
 #
-CONFIG_PM=y
-# CONFIG_PM_DEBUG is not set
 # CONFIG_SUSPEND is not set
 # CONFIG_HIBERNATION is not set
 # CONFIG_PM_RUNTIME is not set
@ -522,9 +518,9 @@ CONFIG_ISA_DMA_API=y
 # CONFIG_MCA is not set
 # CONFIG_SCx200 is not set
 # CONFIG_OLPC is not set
-# CONFIG_OLPC_OPENFIRMWARE is not set
 # CONFIG_PCCARD is not set
 # CONFIG_HOTPLUG_PCI is not set
+# CONFIG_RAPIDIO is not set

 #
 # Executable file formats / Emulations
@ -547,7 +543,6 @@ CONFIG_UNIX=y
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 # CONFIG_IP_ADVANCED_ROUTER is not set
-CONFIG_IP_FIB_HASH=y
 # CONFIG_IP_PNP is not set
 # CONFIG_NET_IPIP is not set
 # CONFIG_NET_IPGRE_DEMUX is not set
@ -603,6 +598,9 @@ CONFIG_IPV6_NDISC_NODETYPE=y
 # CONFIG_VLAN_8021Q is not set
 # CONFIG_DECNET is not set
 # CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
 # CONFIG_LAPB is not set
 # CONFIG_ECONET is not set
 # CONFIG_WAN_ROUTER is not set
@ -613,6 +611,7 @@ CONFIG_IPV6_NDISC_NODETYPE=y
 CONFIG_DNS_RESOLVER=y
 # CONFIG_BATMAN_ADV is not set
 CONFIG_RPS=y
+CONFIG_RFS_ACCEL=y
 CONFIG_XPS=y

 #
@ -622,7 +621,25 @@ CONFIG_XPS=y
 # CONFIG_HAMRADIO is not set
 # CONFIG_CAN is not set
 # CONFIG_IRDA is not set
-# CONFIG_BT is not set
+CONFIG_BT=m
+CONFIG_BT_L2CAP=y
+CONFIG_BT_SCO=y
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+# CONFIG_BT_BNEP is not set
+CONFIG_BT_HIDP=m
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_HCIBTUSB=m
+# CONFIG_BT_HCIUART is not set
+# CONFIG_BT_HCIBCM203X is not set
+# CONFIG_BT_HCIBPA10X is not set
+# CONFIG_BT_HCIBFUSB is not set
+# CONFIG_BT_HCIVHCI is not set
+# CONFIG_BT_MRVL is not set
+# CONFIG_BT_ATH3K is not set
 # CONFIG_AF_RXRPC is not set
 CONFIG_WIRELESS=y
 CONFIG_WIRELESS_EXT=y
@ -677,6 +694,7 @@ CONFIG_FW_LOADER=y
 CONFIG_FIRMWARE_IN_KERNEL=y
 CONFIG_EXTRA_FIRMWARE=""
 # CONFIG_SYS_HYPERVISOR is not set
+CONFIG_ARCH_NO_SYSDEV_OPS=y
 # CONFIG_CONNECTOR is not set
 # CONFIG_MTD is not set
 # CONFIG_PARPORT is not set
@ -711,6 +729,7 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
 # CONFIG_ATA_OVER_ETH is not set
 # CONFIG_BLK_DEV_HD is not set
 # CONFIG_BLK_DEV_RBD is not set
+# CONFIG_SENSORS_LIS3LV02D is not set
 # CONFIG_MISC_DEVICES is not set
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
@ -797,6 +816,7 @@ CONFIG_ATA_PIIX=y
 #
 # CONFIG_PATA_ALI is not set
 # CONFIG_PATA_AMD is not set
+# CONFIG_PATA_ARASAN_CF is not set
 # CONFIG_PATA_ARTOP is not set
 # CONFIG_PATA_ATIIXP is not set
 # CONFIG_PATA_ATP867X is not set
@ -956,7 +976,8 @@ CONFIG_HOSTAP=m
 # CONFIG_HOSTAP_PCI is not set
 # CONFIG_IPW2100 is not set
 # CONFIG_IPW2200 is not set
-# CONFIG_IWLWIFI is not set
+# CONFIG_IWLAGN is not set
+# CONFIG_IWLWIFI_LEGACY is not set
 # CONFIG_LIBERTAS is not set
 # CONFIG_HERMES is not set
 # CONFIG_P54_COMMON is not set
@ -967,14 +988,22 @@ CONFIG_RT2X00=m
 # CONFIG_RT2800PCI is not set
 CONFIG_RT2500USB=m
 CONFIG_RT73USB=m
-# CONFIG_RT2800USB is not set
+CONFIG_RT2800USB=m
+# CONFIG_RT2800USB_RT33XX is not set
+# CONFIG_RT2800USB_RT35XX is not set
+# CONFIG_RT2800USB_UNKNOWN is not set
+CONFIG_RT2800_LIB=m
 CONFIG_RT2X00_LIB_USB=m
 CONFIG_RT2X00_LIB=m
+CONFIG_RT2X00_LIB_HT=y
 CONFIG_RT2X00_LIB_FIRMWARE=y
 CONFIG_RT2X00_LIB_CRYPTO=y
 CONFIG_RT2X00_LIB_LEDS=y
 # CONFIG_RT2X00_DEBUG is not set
 # CONFIG_RTL8192CE is not set
+CONFIG_RTL8192CU=m
+CONFIG_RTLWIFI=m
+CONFIG_RTL8192C_COMMON=m
 # CONFIG_WL1251 is not set
 # CONFIG_WL12XX_MENU is not set
 CONFIG_ZD1211RW=m
@ -1036,6 +1065,7 @@ CONFIG_INPUT_EVDEV=y
 CONFIG_INPUT_KEYBOARD=y
 # CONFIG_KEYBOARD_ADP5588 is not set
 CONFIG_KEYBOARD_ATKBD=y
+# CONFIG_KEYBOARD_QT1070 is not set
 # CONFIG_KEYBOARD_QT2160 is not set
 # CONFIG_KEYBOARD_LKKBD is not set
 # CONFIG_KEYBOARD_TCA6416 is not set
@ -1128,10 +1158,13 @@ CONFIG_CONSOLE_TRANSLATIONS=y
 CONFIG_VT_CONSOLE=y
 CONFIG_HW_CONSOLE=y
 CONFIG_VT_HW_CONSOLE_BINDING=y
-# CONFIG_DEVKMEM is not set
+CONFIG_UNIX98_PTYS=y
+# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
+# CONFIG_LEGACY_PTYS is not set
 # CONFIG_SERIAL_NONSTANDARD is not set
-# CONFIG_N_GSM is not set
 # CONFIG_NOZOMI is not set
+# CONFIG_N_GSM is not set
+# CONFIG_DEVKMEM is not set

 #
 # Serial drivers
@ -1154,9 +1187,7 @@ CONFIG_SERIAL_CORE=y
 # CONFIG_SERIAL_TIMBERDALE is not set
 # CONFIG_SERIAL_ALTERA_JTAGUART is not set
 # CONFIG_SERIAL_ALTERA_UART is not set
-CONFIG_UNIX98_PTYS=y
-# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
-# CONFIG_LEGACY_PTYS is not set
+# CONFIG_SERIAL_PCH_UART is not set
 # CONFIG_TTY_PRINTK is not set
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_HW_RANDOM is not set
@ -1177,7 +1208,7 @@ CONFIG_DEVPORT=y
 CONFIG_I2C=y
 CONFIG_I2C_BOARDINFO=y
 # CONFIG_I2C_COMPAT is not set
-CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_CHARDEV=y
 # CONFIG_I2C_MUX is not set
 CONFIG_I2C_HELPER_AUTO=y
 CONFIG_I2C_ALGOBIT=y
@ -1215,6 +1246,7 @@ CONFIG_I2C_I801=y
 # CONFIG_I2C_INTEL_MID is not set
 # CONFIG_I2C_OCORES is not set
 # CONFIG_I2C_PCA_PLATFORM is not set
+# CONFIG_I2C_PXA_PCI is not set
 # CONFIG_I2C_SIMTEC is not set
 # CONFIG_I2C_XILINX is not set
 # CONFIG_I2C_EG20T is not set
@ -1222,6 +1254,7 @@ CONFIG_I2C_I801=y
 #
 # External I2C/SMBus adapter drivers
 #
+# CONFIG_I2C_DIOLAN_U2C is not set
 # CONFIG_I2C_PARPORT_LIGHT is not set
 # CONFIG_I2C_TAOS_EVM is not set
 # CONFIG_I2C_TINY_USB is not set
@ -1280,6 +1313,7 @@ CONFIG_MEDIA_SUPPORT=y
 #
 # Multimedia core support
 #
+# CONFIG_MEDIA_CONTROLLER is not set
 # CONFIG_VIDEO_DEV is not set
 CONFIG_DVB_CORE=y
 CONFIG_VIDEO_MEDIA=y
@ -1300,8 +1334,8 @@ CONFIG_IR_RC5_SZ_DECODER=y
 # CONFIG_IR_ENE is not set
 # CONFIG_IR_IMON is not set
 CONFIG_IR_MCEUSB=m
-# CONFIG_IR_NUVOTON is not set
 # CONFIG_IR_ITE_CIR is not set
+# CONFIG_IR_NUVOTON is not set
 # CONFIG_IR_STREAMZAP is not set
 # CONFIG_IR_WINBOND_CIR is not set
 # CONFIG_RC_LOOPBACK is not set
@ -1370,6 +1404,7 @@ CONFIG_DVB_USB_AF9015=m
 # CONFIG_DVB_USB_EC168 is not set
 # CONFIG_DVB_USB_AZ6027 is not set
 # CONFIG_DVB_USB_LME2510 is not set
+CONFIG_DVB_USB_TECHNISAT_USB2=m
 # CONFIG_DVB_TTUSB_BUDGET is not set
 # CONFIG_DVB_TTUSB_DEC is not set
 CONFIG_SMS_SIANO_MDTV=m
@ -1397,6 +1432,10 @@ CONFIG_SMS_USB_DRV=m
 # Supported SDMC DM1105 Adapters
 #
 # CONFIG_DVB_DM1105 is not set
+
+#
+# Supported FireWire (IEEE 1394) Adapters
+#
 # CONFIG_DVB_FIREDTV is not set

 #
@ -1422,6 +1461,7 @@ CONFIG_SMS_USB_DRV=m
 #
 # Multistandard (satellite) frontends
 #
+CONFIG_DVB_STB0899=m
 CONFIG_DVB_STB6100=m

 #
@ -1503,6 +1543,7 @@ CONFIG_DRM_TTM=y
 # CONFIG_DRM_TDFX is not set
 # CONFIG_DRM_R128 is not set
 # CONFIG_DRM_RADEON is not set
+# CONFIG_DRM_I915 is not set
 # CONFIG_DRM_MGA is not set
 # CONFIG_DRM_SIS is not set
 # CONFIG_DRM_VIA is not set
@ -1578,7 +1619,7 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_GENERIC is not set
 # CONFIG_BACKLIGHT_PROGEAR is not set
-# CONFIG_BACKLIGHT_MBP_NVIDIA is not set
+# CONFIG_BACKLIGHT_APPLE is not set
 # CONFIG_BACKLIGHT_SAHARA is not set
 # CONFIG_BACKLIGHT_ADP8860 is not set

@ -1710,6 +1751,7 @@ CONFIG_SND_HDA_GENERIC=y
 # CONFIG_SND_VX222 is not set
 # CONFIG_SND_YMFPCI is not set
 # CONFIG_SND_USB is not set
+# CONFIG_SND_FIREWIRE is not set
 # CONFIG_SND_SOC is not set
 # CONFIG_SOUND_PRIME is not set
 CONFIG_HID_SUPPORT=y
@ -1739,19 +1781,22 @@ CONFIG_HID_AUREAL=y
 # CONFIG_HID_CYPRESS is not set
 # CONFIG_HID_DRAGONRISE is not set
 # CONFIG_HID_EMS_FF is not set
-# CONFIG_HID_EGALAX is not set
+# CONFIG_HID_ELECOM is not set
 # CONFIG_HID_EZKEY is not set
+# CONFIG_HID_KEYTOUCH is not set
 # CONFIG_HID_KYE is not set
 # CONFIG_HID_UCLOGIC is not set
 # CONFIG_HID_WALTOP is not set
 # CONFIG_HID_GYRATION is not set
 CONFIG_HID_TWINHAN=y
 # CONFIG_HID_KENSINGTON is not set
+# CONFIG_HID_LCPOWER is not set
 CONFIG_HID_LOGITECH=y
 CONFIG_LOGITECH_FF=y
 CONFIG_LOGIRUMBLEPAD2_FF=y
 CONFIG_LOGIG940_FF=y
 CONFIG_LOGIWII_FF=y
+# CONFIG_HID_MAGICMOUSE is not set
 CONFIG_HID_MICROSOFT=y
 # CONFIG_HID_MOSART is not set
 # CONFIG_HID_MONTEREY is not set
@ -1763,8 +1808,10 @@ CONFIG_HID_MICROSOFT=y
 # CONFIG_HID_PICOLCD is not set
 # CONFIG_HID_QUANTA is not set
 # CONFIG_HID_ROCCAT is not set
+# CONFIG_HID_ROCCAT_ARVO is not set
 # CONFIG_HID_ROCCAT_KONE is not set
 # CONFIG_HID_ROCCAT_KONEPLUS is not set
+# CONFIG_HID_ROCCAT_KOVAPLUS is not set
 # CONFIG_HID_ROCCAT_PYRA is not set
 # CONFIG_HID_SAMSUNG is not set
 CONFIG_HID_SONY=y
@ -1774,6 +1821,7 @@ CONFIG_HID_SUNPLUS=y
 # CONFIG_HID_SMARTJOYPLUS is not set
 CONFIG_HID_TOPSEED=y
 # CONFIG_HID_THRUSTMASTER is not set
+# CONFIG_HID_WACOM is not set
 # CONFIG_HID_ZEROPLUS is not set
 # CONFIG_HID_ZYDACRON is not set
 CONFIG_USB_SUPPORT=y
@ -1832,6 +1880,7 @@ CONFIG_USB_UHCI_HCD=y
 #
 CONFIG_USB_STORAGE=y
 # CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_REALTEK is not set
 # CONFIG_USB_STORAGE_DATAFAB is not set
 # CONFIG_USB_STORAGE_FREECOM is not set
 # CONFIG_USB_STORAGE_ISD200 is not set
@ -1843,6 +1892,7 @@ CONFIG_USB_STORAGE=y
 # CONFIG_USB_STORAGE_ONETOUCH is not set
 # CONFIG_USB_STORAGE_KARMA is not set
 # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
+# CONFIG_USB_STORAGE_ENE_UB6250 is not set
 # CONFIG_USB_UAS is not set
 # CONFIG_USB_LIBUSUAL is not set

@ -1946,6 +1996,7 @@ CONFIG_LEDS_CLASS=y
 #
 # LED drivers
 #
+# CONFIG_LEDS_LM3530 is not set
 # CONFIG_LEDS_ALIX2 is not set
 # CONFIG_LEDS_PCA9532 is not set
 # CONFIG_LEDS_LP3944 is not set
@ -2037,13 +2088,13 @@ CONFIG_RTC_DRV_CMOS=y
 # CONFIG_UIO is not set
 CONFIG_STAGING=y
 # CONFIG_STAGING_EXCLUDE_BUILD is not set
-# CONFIG_USB_DABUSB is not set
+# CONFIG_USB_IP_COMMON is not set
 # CONFIG_W35UND is not set
 # CONFIG_PRISM2_USB is not set
 # CONFIG_ECHO is not set
 # CONFIG_BRCM80211 is not set
-CONFIG_RT2860=m
-CONFIG_RT2870=m
+# CONFIG_RT2860 is not set
+# CONFIG_RT2870 is not set
 # CONFIG_COMEDI is not set
 # CONFIG_ASUS_OLED is not set
 # CONFIG_R8187SE is not set
@ -2051,6 +2102,7 @@ CONFIG_RT2870=m
 # CONFIG_RTL8192E is not set
 CONFIG_R8712U=m
 CONFIG_R8712_AP=y
+# CONFIG_RTS_PSTOR is not set
 # CONFIG_TRANZPORT is not set
 # CONFIG_POHMELFS is not set
 # CONFIG_IDE_PHISON is not set
@ -2073,14 +2125,11 @@ CONFIG_DRM_I2C_SIL164=m
 # CONFIG_DX_SEP is not set
 # CONFIG_IIO is not set
 # CONFIG_CS5535_GPIO is not set
+# CONFIG_XVMALLOC is not set
 # CONFIG_ZRAM is not set
 # CONFIG_SAMSUNG_LAPTOP is not set
 # CONFIG_FB_SM7XX is not set
 # CONFIG_CRYSTALHD is not set
-
-#
-# Texas Instruments shared transport line discipline
-#
 # CONFIG_FB_XGI is not set
 # CONFIG_LIRC_STAGING is not set
 # CONFIG_ACPI_QUICKSTART is not set
@ -2094,6 +2143,12 @@ CONFIG_MACH_NO_WESTBRIDGE=y
 #
 # CONFIG_SPEAKUP is not set
 # CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set
+# CONFIG_DRM_PSB is not set
+
+#
+# Altera FPGA firmware download module
+#
+# CONFIG_ALTERA_STAPL is not set
 # CONFIG_X86_PLATFORM_DEVICES is not set

 #
@ -2105,7 +2160,9 @@ CONFIG_MACH_NO_WESTBRIDGE=y
 # CONFIG_DELL_RBU is not set
 # CONFIG_DCDBAS is not set
 CONFIG_DMIID=y
+# CONFIG_DMI_SYSFS is not set
 # CONFIG_ISCSI_IBFT_FIND is not set
+# CONFIG_SIGMA is not set

 #
 # File systems
@ -2173,6 +2230,7 @@ CONFIG_TMPFS=y
 # CONFIG_HUGETLB_PAGE is not set
 # CONFIG_CONFIGFS_FS is not set
 CONFIG_MISC_FILESYSTEMS=y
+# CONFIG_ADFS_FS is not set
 # CONFIG_AFFS_FS is not set
 # CONFIG_ECRYPT_FS is not set
 # CONFIG_HFS_FS is not set
@ -2193,7 +2251,9 @@ CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
 # CONFIG_OMFS_FS is not set
 # CONFIG_QNX4FS_FS is not set
 # CONFIG_ROMFS_FS is not set
+# CONFIG_PSTORE is not set
 # CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=y
 CONFIG_NFS_V3=y
@ -2292,6 +2352,7 @@ CONFIG_NLS_UTF8=y
 #
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_PRINTK_TIME=y
+CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
 # CONFIG_ENABLE_WARN_DEPRECATED is not set
 # CONFIG_ENABLE_MUST_CHECK is not set
 CONFIG_FRAME_WARN=1024
@ -2300,10 +2361,10 @@ CONFIG_FRAME_WARN=1024
 # CONFIG_UNUSED_SYMBOLS is not set
 # CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_SECTION_MISMATCH is not set
 # CONFIG_DEBUG_KERNEL is not set
 # CONFIG_HARDLOCKUP_DETECTOR is not set
 # CONFIG_SLUB_STATS is not set
-# CONFIG_BKL is not set
 # CONFIG_SPARSE_RCU_POINTER is not set
 # CONFIG_DEBUG_MEMORY_INIT is not set
 CONFIG_ARCH_WANT_FRAME_POINTERS=y
@ -2328,6 +2389,7 @@ CONFIG_TRACING_SUPPORT=y
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_ARCH_KGDB=y
 CONFIG_HAVE_ARCH_KMEMCHECK=y
+# CONFIG_TEST_KSTRTOX is not set
 CONFIG_STRICT_DEVMEM=y
 # CONFIG_X86_VERBOSE_BOOTUP is not set
 # CONFIG_EARLY_PRINTK is not set
@ -2494,5 +2556,6 @@ CONFIG_XZ_DEC_BCJ=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_DMA=y
+CONFIG_CPU_RMAP=y
 CONFIG_NLATTR=y
 CONFIG_AVERAGE=y
--- a/projects/ATV/options
+++ b/projects/ATV/options
@ -147,9 +147,6 @@
 # build and install SABnzbd Newsgroup downloader daemon (yes / no)
  SABNZBD="no"

-# build and install SickBeard Newsgroup downloader daemon (yes / no)
-  SICKBEARD="no"
-
 # build and install some tools for including in release (yes / no)
 # some of this tools are: htop, nano, wgetpaste
  TOOLS="yes"
@ -177,7 +174,7 @@
  GRAPHIC_DRIVERS="nouveau"

 # use libdrm-master (latest git) instead latest released version
-  LIBDRM_MASTER="yes"
+  LIBDRM_MASTER="no"

 # use Mesa-master (latest git) instead latest released version
  MESA_MASTER="yes"
--- a/projects/Generic/linux/linux.i386.conf
+++ b/projects/Generic/linux/linux.i386.conf
@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Linux/i386 2.6.38.2 Kernel Configuration
+# Linux/i386 2.6.39-rc3 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@ -46,7 +46,6 @@ CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_HAVE_INTEL_TXT=y
 CONFIG_X86_32_SMP=y
 CONFIG_X86_HT=y
-CONFIG_X86_TRAMPOLINE=y
 CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx"
 CONFIG_KTIME_SCALAR=y
 CONFIG_ARCH_CPU_PROBE_RELEASE=y
@ -80,6 +79,7 @@ CONFIG_POSIX_MQUEUE=y
 CONFIG_POSIX_MQUEUE_SYSCTL=y
 CONFIG_BSD_PROCESS_ACCT=y
 # CONFIG_BSD_PROCESS_ACCT_V3 is not set
+# CONFIG_FHANDLE is not set
 # CONFIG_TASKSTATS is not set
 # CONFIG_AUDIT is not set
 CONFIG_HAVE_GENERIC_HARDIRQS=y
@ -88,13 +88,11 @@ CONFIG_HAVE_GENERIC_HARDIRQS=y
 # IRQ subsystem
 #
 CONFIG_GENERIC_HARDIRQS=y
-# CONFIG_GENERIC_HARDIRQS_NO_DEPRECATED is not set
 CONFIG_HAVE_SPARSE_IRQ=y
 CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_IRQ_SHOW=y
 CONFIG_GENERIC_PENDING_IRQ=y
-# CONFIG_AUTO_IRQ_AFFINITY is not set
-# CONFIG_IRQ_PER_CPU is not set
-# CONFIG_HARDIRQS_SW_RESEND is not set
+CONFIG_IRQ_FORCED_THREADING=y
 # CONFIG_SPARSE_IRQ is not set

 #
@ -120,6 +118,7 @@ CONFIG_PROC_PID_CPUSET=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_RESOURCE_COUNTERS=y
 # CONFIG_CGROUP_MEM_RES_CTLR is not set
+# CONFIG_CGROUP_PERF is not set
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_RT_GROUP_SCHED=y
@ -292,7 +291,6 @@ CONFIG_NO_BOOTMEM=y
 CONFIG_MCORE2=y
 # CONFIG_MATOM is not set
 CONFIG_X86_GENERIC=y
-CONFIG_X86_CPU=y
 CONFIG_X86_INTERNODE_CACHE_SHIFT=6
 CONFIG_X86_CMPXCHG=y
 CONFIG_CMPXCHG_LOCAL=y
@ -385,7 +383,7 @@ CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
 CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
 CONFIG_X86_PAT=y
 CONFIG_ARCH_USES_PG_UNCACHED=y
-# CONFIG_EFI is not set
+CONFIG_EFI=y
 CONFIG_SECCOMP=y
 CONFIG_CC_STACKPROTECTOR=y
 # CONFIG_HZ_100 is not set
@ -409,14 +407,13 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 #
 # Power management and ACPI options
 #
-CONFIG_PM=y
-# CONFIG_PM_DEBUG is not set
-CONFIG_PM_SLEEP_SMP=y
-CONFIG_PM_SLEEP=y
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
+CONFIG_PM_SLEEP=y
+CONFIG_PM_SLEEP_SMP=y
 CONFIG_PM_RUNTIME=y
-CONFIG_PM_OPS=y
+CONFIG_PM=y
+# CONFIG_PM_DEBUG is not set
 CONFIG_ACPI=y
 CONFIG_ACPI_SLEEP=y
 # CONFIG_ACPI_PROCFS is not set
@ -524,10 +521,10 @@ CONFIG_ISA_DMA_API=y
 # CONFIG_MCA is not set
 # CONFIG_SCx200 is not set
 # CONFIG_OLPC is not set
-# CONFIG_OLPC_OPENFIRMWARE is not set
 CONFIG_AMD_NB=y
 # CONFIG_PCCARD is not set
 # CONFIG_HOTPLUG_PCI is not set
+# CONFIG_RAPIDIO is not set

 #
 # Executable file formats / Emulations
@ -550,7 +547,6 @@ CONFIG_UNIX=y
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 # CONFIG_IP_ADVANCED_ROUTER is not set
-CONFIG_IP_FIB_HASH=y
 # CONFIG_IP_PNP is not set
 # CONFIG_NET_IPIP is not set
 # CONFIG_NET_IPGRE_DEMUX is not set
@ -606,6 +602,9 @@ CONFIG_IPV6_NDISC_NODETYPE=y
 # CONFIG_VLAN_8021Q is not set
 # CONFIG_DECNET is not set
 # CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
 # CONFIG_LAPB is not set
 # CONFIG_ECONET is not set
 # CONFIG_WAN_ROUTER is not set
@ -616,6 +615,7 @@ CONFIG_IPV6_NDISC_NODETYPE=y
 CONFIG_DNS_RESOLVER=y
 # CONFIG_BATMAN_ADV is not set
 CONFIG_RPS=y
+CONFIG_RFS_ACCEL=y
 CONFIG_XPS=y

 #
@ -626,8 +626,8 @@ CONFIG_XPS=y
 # CONFIG_CAN is not set
 # CONFIG_IRDA is not set
 CONFIG_BT=m
-CONFIG_BT_L2CAP=m
-CONFIG_BT_SCO=m
+CONFIG_BT_L2CAP=y
+CONFIG_BT_SCO=y
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BT_BNEP is not set
@ -700,6 +700,7 @@ CONFIG_FIRMWARE_IN_KERNEL=y
 CONFIG_EXTRA_FIRMWARE=" radeon/R600_rlc.bin radeon/R700_rlc.bin"
 CONFIG_EXTRA_FIRMWARE_DIR="firmware"
 # CONFIG_SYS_HYPERVISOR is not set
+CONFIG_ARCH_NO_SYSDEV_OPS=y
 # CONFIG_CONNECTOR is not set
 # CONFIG_MTD is not set
 # CONFIG_PARPORT is not set
@ -734,6 +735,7 @@ CONFIG_BLK_DEV_RAM_SIZE=16384
 # CONFIG_ATA_OVER_ETH is not set
 # CONFIG_BLK_DEV_HD is not set
 # CONFIG_BLK_DEV_RBD is not set
+# CONFIG_SENSORS_LIS3LV02D is not set
 CONFIG_MISC_DEVICES=y
 # CONFIG_AD525X_DPOT is not set
 # CONFIG_IBM_ASM is not set
@ -772,6 +774,7 @@ CONFIG_EEPROM_93CX6=m
 # Texas Instruments shared transport line discipline
 #
 # CONFIG_TI_ST is not set
+# CONFIG_SENSORS_LIS3_I2C is not set
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set

@ -849,7 +852,7 @@ CONFIG_SATA_NV=y
 # CONFIG_SATA_SIS is not set
 # CONFIG_SATA_SVW is not set
 # CONFIG_SATA_ULI is not set
-# CONFIG_SATA_VIA is not set
+CONFIG_SATA_VIA=y
 # CONFIG_SATA_VITESSE is not set

 #
@ -857,6 +860,7 @@ CONFIG_SATA_NV=y
 #
 # CONFIG_PATA_ALI is not set
 CONFIG_PATA_AMD=y
+# CONFIG_PATA_ARASAN_CF is not set
 # CONFIG_PATA_ARTOP is not set
 # CONFIG_PATA_ATIIXP is not set
 # CONFIG_PATA_ATP867X is not set
@ -1103,15 +1107,20 @@ CONFIG_IPW2200=m
 # CONFIG_IPW2200_DEBUG is not set
 CONFIG_LIBIPW=m
 # CONFIG_LIBIPW_DEBUG is not set
-CONFIG_IWLWIFI=m
+CONFIG_IWLAGN=m

 #
 # Debugging Options
 #
 # CONFIG_IWLWIFI_DEBUG is not set
-CONFIG_IWLAGN=m
-CONFIG_IWL4965=y
-CONFIG_IWL5000=y
+# CONFIG_IWL_P2P is not set
+CONFIG_IWLWIFI_LEGACY=m
+
+#
+# Debugging Options
+#
+# CONFIG_IWLWIFI_LEGACY_DEBUG is not set
+CONFIG_IWL4965=m
 CONFIG_IWL3945=m
 # CONFIG_IWM is not set
 CONFIG_LIBERTAS=m
@ -1125,19 +1134,29 @@ CONFIG_RT2X00=m
 CONFIG_RT2400PCI=m
 CONFIG_RT2500PCI=m
 CONFIG_RT61PCI=m
-# CONFIG_RT2800PCI is not set
+CONFIG_RT2800PCI=m
+# CONFIG_RT2800PCI_RT33XX is not set
+# CONFIG_RT2800PCI_RT35XX is not set
+# CONFIG_RT2800PCI_RT53XX is not set
 CONFIG_RT2500USB=m
 CONFIG_RT73USB=m
-# CONFIG_RT2800USB is not set
+CONFIG_RT2800USB=m
+# CONFIG_RT2800USB_RT33XX is not set
+# CONFIG_RT2800USB_RT35XX is not set
+# CONFIG_RT2800USB_UNKNOWN is not set
+CONFIG_RT2800_LIB=m
 CONFIG_RT2X00_LIB_PCI=m
 CONFIG_RT2X00_LIB_USB=m
 CONFIG_RT2X00_LIB=m
+CONFIG_RT2X00_LIB_HT=y
 CONFIG_RT2X00_LIB_FIRMWARE=y
 CONFIG_RT2X00_LIB_CRYPTO=y
 CONFIG_RT2X00_LIB_LEDS=y
 # CONFIG_RT2X00_DEBUG is not set
 CONFIG_RTL8192CE=m
+CONFIG_RTL8192CU=m
 CONFIG_RTLWIFI=m
+CONFIG_RTL8192C_COMMON=m
 # CONFIG_WL1251 is not set
 # CONFIG_WL12XX_MENU is not set
 CONFIG_ZD1211RW=m
@ -1199,6 +1218,7 @@ CONFIG_INPUT_EVDEV=y
 CONFIG_INPUT_KEYBOARD=y
 # CONFIG_KEYBOARD_ADP5588 is not set
 CONFIG_KEYBOARD_ATKBD=y
+# CONFIG_KEYBOARD_QT1070 is not set
 # CONFIG_KEYBOARD_QT2160 is not set
 # CONFIG_KEYBOARD_LKKBD is not set
 # CONFIG_KEYBOARD_TCA6416 is not set
@ -1291,10 +1311,13 @@ CONFIG_CONSOLE_TRANSLATIONS=y
 CONFIG_VT_CONSOLE=y
 CONFIG_HW_CONSOLE=y
 CONFIG_VT_HW_CONSOLE_BINDING=y
-# CONFIG_DEVKMEM is not set
+CONFIG_UNIX98_PTYS=y
+# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
+# CONFIG_LEGACY_PTYS is not set
 # CONFIG_SERIAL_NONSTANDARD is not set
-# CONFIG_N_GSM is not set
 # CONFIG_NOZOMI is not set
+# CONFIG_N_GSM is not set
+# CONFIG_DEVKMEM is not set

 #
 # Serial drivers
@ -1317,9 +1340,7 @@ CONFIG_SERIAL_CORE=y
 # CONFIG_SERIAL_TIMBERDALE is not set
 # CONFIG_SERIAL_ALTERA_JTAGUART is not set
 # CONFIG_SERIAL_ALTERA_UART is not set
-CONFIG_UNIX98_PTYS=y
-# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
-# CONFIG_LEGACY_PTYS is not set
+# CONFIG_SERIAL_PCH_UART is not set
 # CONFIG_TTY_PRINTK is not set
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_HW_RANDOM is not set
@ -1340,7 +1361,7 @@ CONFIG_DEVPORT=y
 CONFIG_I2C=y
 CONFIG_I2C_BOARDINFO=y
 # CONFIG_I2C_COMPAT is not set
-CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_CHARDEV=y
 # CONFIG_I2C_MUX is not set
 CONFIG_I2C_HELPER_AUTO=y
 CONFIG_I2C_ALGOBIT=y
@ -1357,16 +1378,16 @@ CONFIG_I2C_ALGOBIT=y
 # CONFIG_I2C_ALI15X3 is not set
 # CONFIG_I2C_AMD756 is not set
 # CONFIG_I2C_AMD8111 is not set
-CONFIG_I2C_I801=m
-CONFIG_I2C_ISCH=m
+CONFIG_I2C_I801=y
+CONFIG_I2C_ISCH=y
 # CONFIG_I2C_PIIX4 is not set
-CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_NFORCE2=y
 # CONFIG_I2C_NFORCE2_S4985 is not set
 # CONFIG_I2C_SIS5595 is not set
 # CONFIG_I2C_SIS630 is not set
 # CONFIG_I2C_SIS96X is not set
-# CONFIG_I2C_VIA is not set
-# CONFIG_I2C_VIAPRO is not set
+CONFIG_I2C_VIA=y
+CONFIG_I2C_VIAPRO=y

 #
 # ACPI drivers
@ -1376,9 +1397,10 @@ CONFIG_I2C_NFORCE2=m
 #
 # I2C system bus drivers (mostly embedded / system-on-chip)
 #
-CONFIG_I2C_INTEL_MID=m
+CONFIG_I2C_INTEL_MID=y
 # CONFIG_I2C_OCORES is not set
 # CONFIG_I2C_PCA_PLATFORM is not set
+# CONFIG_I2C_PXA_PCI is not set
 # CONFIG_I2C_SIMTEC is not set
 # CONFIG_I2C_XILINX is not set
 # CONFIG_I2C_EG20T is not set
@ -1386,6 +1408,7 @@ CONFIG_I2C_INTEL_MID=m
 #
 # External I2C/SMBus adapter drivers
 #
+# CONFIG_I2C_DIOLAN_U2C is not set
 # CONFIG_I2C_PARPORT_LIGHT is not set
 # CONFIG_I2C_TAOS_EVM is not set
 # CONFIG_I2C_TINY_USB is not set
@ -1460,6 +1483,7 @@ CONFIG_SENSORS_CORETEMP=m
 CONFIG_SENSORS_PKGTEMP=m
 CONFIG_SENSORS_IT87=m
 # CONFIG_SENSORS_JC42 is not set
+# CONFIG_SENSORS_LINEAGE is not set
 # CONFIG_SENSORS_LM63 is not set
 # CONFIG_SENSORS_LM73 is not set
 # CONFIG_SENSORS_LM75 is not set
@ -1472,15 +1496,18 @@ CONFIG_SENSORS_IT87=m
 # CONFIG_SENSORS_LM90 is not set
 # CONFIG_SENSORS_LM92 is not set
 # CONFIG_SENSORS_LM93 is not set
+# CONFIG_SENSORS_LTC4151 is not set
 # CONFIG_SENSORS_LTC4215 is not set
 # CONFIG_SENSORS_LTC4245 is not set
 # CONFIG_SENSORS_LTC4261 is not set
 # CONFIG_SENSORS_LM95241 is not set
 # CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_MAX6639 is not set
 # CONFIG_SENSORS_MAX6650 is not set
 # CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SENSORS_PC87427 is not set
 # CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_PMBUS is not set
 # CONFIG_SENSORS_SHT21 is not set
 # CONFIG_SENSORS_SIS5595 is not set
 # CONFIG_SENSORS_SMM665 is not set
@ -1490,6 +1517,8 @@ CONFIG_SENSORS_IT87=m
 # CONFIG_SENSORS_SMSC47M1 is not set
 # CONFIG_SENSORS_SMSC47M192 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_SCH5627 is not set
+# CONFIG_SENSORS_ADS1015 is not set
 # CONFIG_SENSORS_ADS7828 is not set
 # CONFIG_SENSORS_AMC6821 is not set
 # CONFIG_SENSORS_THMC50 is not set
@ -1509,14 +1538,12 @@ CONFIG_SENSORS_IT87=m
 # CONFIG_SENSORS_W83L786NG is not set
 # CONFIG_SENSORS_W83627HF is not set
 # CONFIG_SENSORS_W83627EHF is not set
-# CONFIG_SENSORS_LIS3_I2C is not set
 # CONFIG_SENSORS_APPLESMC is not set

 #
 # ACPI drivers
 #
 # CONFIG_SENSORS_ATK0110 is not set
-# CONFIG_SENSORS_LIS3LV02D is not set
 CONFIG_THERMAL=y
 CONFIG_THERMAL_HWMON=y
 # CONFIG_WATCHDOG is not set
@ -1538,10 +1565,11 @@ CONFIG_SSB_SDIOHOST_POSSIBLE=y
 CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
 CONFIG_SSB_DRIVER_PCICORE=y
 CONFIG_MFD_SUPPORT=y
-CONFIG_MFD_CORE=m
+CONFIG_MFD_CORE=y
 # CONFIG_MFD_88PM860X is not set
 # CONFIG_MFD_SM501 is not set
 # CONFIG_HTC_PASIC3 is not set
+# CONFIG_TPS6105X is not set
 # CONFIG_TPS6507X is not set
 # CONFIG_TWL4030_CORE is not set
 # CONFIG_MFD_STMPE is not set
@ -1550,6 +1578,7 @@ CONFIG_MFD_CORE=m
 # CONFIG_PMIC_DA903X is not set
 # CONFIG_PMIC_ADP5520 is not set
 # CONFIG_MFD_MAX8925 is not set
+# CONFIG_MFD_MAX8997 is not set
 # CONFIG_MFD_MAX8998 is not set
 # CONFIG_MFD_WM8400 is not set
 # CONFIG_MFD_WM831X_I2C is not set
@ -1558,7 +1587,7 @@ CONFIG_MFD_CORE=m
 # CONFIG_MFD_PCF50633 is not set
 # CONFIG_ABX500_CORE is not set
 # CONFIG_MFD_CS5535 is not set
-CONFIG_LPC_SCH=m
+CONFIG_LPC_SCH=y
 # CONFIG_MFD_RDC321X is not set
 # CONFIG_MFD_JANZ_CMODIO is not set
 # CONFIG_MFD_VX855 is not set
@ -1569,6 +1598,7 @@ CONFIG_MEDIA_SUPPORT=y
 #
 # Multimedia core support
 #
+# CONFIG_MEDIA_CONTROLLER is not set
 # CONFIG_VIDEO_DEV is not set
 CONFIG_DVB_CORE=y
 CONFIG_VIDEO_MEDIA=y
@ -1590,8 +1620,8 @@ CONFIG_IR_RC5_SZ_DECODER=y
 CONFIG_IR_ENE=m
 CONFIG_IR_IMON=m
 CONFIG_IR_MCEUSB=m
-CONFIG_IR_NUVOTON=m
 CONFIG_IR_ITE_CIR=m
+CONFIG_IR_NUVOTON=m
 CONFIG_IR_STREAMZAP=m
 CONFIG_IR_WINBOND_CIR=m
 # CONFIG_RC_LOOPBACK is not set
@ -1663,6 +1693,7 @@ CONFIG_DVB_USB_AF9015=m
 # CONFIG_DVB_USB_EC168 is not set
 # CONFIG_DVB_USB_AZ6027 is not set
 # CONFIG_DVB_USB_LME2510 is not set
+CONFIG_DVB_USB_TECHNISAT_USB2=m
 # CONFIG_DVB_TTUSB_BUDGET is not set
 # CONFIG_DVB_TTUSB_DEC is not set
 CONFIG_SMS_SIANO_MDTV=m
@ -1691,6 +1722,10 @@ CONFIG_SMS_SDIO_DRV=m
 # Supported SDMC DM1105 Adapters
 #
 # CONFIG_DVB_DM1105 is not set
+
+#
+# Supported FireWire (IEEE 1394) Adapters
+#
 # CONFIG_DVB_FIREDTV is not set

 #
@ -1807,11 +1842,11 @@ CONFIG_AGP_INTEL=y
 # CONFIG_AGP_NVIDIA is not set
 # CONFIG_AGP_SIS is not set
 # CONFIG_AGP_SWORKS is not set
-# CONFIG_AGP_VIA is not set
+CONFIG_AGP_VIA=y
 # CONFIG_AGP_EFFICEON is not set
 CONFIG_VGA_ARB=y
 CONFIG_VGA_ARB_MAX_GPUS=16
-# CONFIG_VGA_SWITCHEROO is not set
+CONFIG_VGA_SWITCHEROO=y
 CONFIG_DRM=y
 CONFIG_DRM_KMS_HELPER=y
 CONFIG_DRM_TTM=y
@ -1860,6 +1895,7 @@ CONFIG_FB_MODE_HELPERS=y
 # CONFIG_FB_IMSTT is not set
 # CONFIG_FB_VGA16 is not set
 CONFIG_FB_VESA=y
+CONFIG_FB_EFI=y
 # CONFIG_FB_N411 is not set
 # CONFIG_FB_HGA is not set
 # CONFIG_FB_S1D13XXX is not set
@ -1896,7 +1932,7 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_GENERIC is not set
 # CONFIG_BACKLIGHT_PROGEAR is not set
-# CONFIG_BACKLIGHT_MBP_NVIDIA is not set
+# CONFIG_BACKLIGHT_APPLE is not set
 # CONFIG_BACKLIGHT_SAHARA is not set
 # CONFIG_BACKLIGHT_ADP8860 is not set

@ -1965,7 +2001,7 @@ CONFIG_SND_PCI=y
 # CONFIG_SND_CS46XX is not set
 # CONFIG_SND_CS5530 is not set
 # CONFIG_SND_CS5535AUDIO is not set
-# CONFIG_SND_CTXFI is not set
+CONFIG_SND_CTXFI=m
 # CONFIG_SND_DARLA20 is not set
 # CONFIG_SND_GINA20 is not set
 # CONFIG_SND_LAYLA20 is not set
@ -2035,6 +2071,8 @@ CONFIG_SND_USB_AUDIO=m
 # CONFIG_SND_USB_USX2Y is not set
 # CONFIG_SND_USB_CAIAQ is not set
 # CONFIG_SND_USB_US122L is not set
+# CONFIG_SND_USB_6FIRE is not set
+# CONFIG_SND_FIREWIRE is not set
 # CONFIG_SND_SOC is not set
 # CONFIG_SOUND_PRIME is not set
 CONFIG_AC97_BUS=m
@ -2065,15 +2103,16 @@ CONFIG_HID_AUREAL=y
 # CONFIG_HID_CYPRESS is not set
 # CONFIG_HID_DRAGONRISE is not set
 # CONFIG_HID_EMS_FF is not set
-# CONFIG_HID_EGALAX is not set
 # CONFIG_HID_ELECOM is not set
 # CONFIG_HID_EZKEY is not set
+# CONFIG_HID_KEYTOUCH is not set
 # CONFIG_HID_KYE is not set
 # CONFIG_HID_UCLOGIC is not set
 # CONFIG_HID_WALTOP is not set
 # CONFIG_HID_GYRATION is not set
 CONFIG_HID_TWINHAN=y
 # CONFIG_HID_KENSINGTON is not set
+# CONFIG_HID_LCPOWER is not set
 CONFIG_HID_LOGITECH=y
 CONFIG_LOGITECH_FF=y
 CONFIG_LOGIRUMBLEPAD2_FF=y
@ -2091,8 +2130,10 @@ CONFIG_HID_MICROSOFT=y
 # CONFIG_HID_PICOLCD is not set
 # CONFIG_HID_QUANTA is not set
 # CONFIG_HID_ROCCAT is not set
+# CONFIG_HID_ROCCAT_ARVO is not set
 # CONFIG_HID_ROCCAT_KONE is not set
 # CONFIG_HID_ROCCAT_KONEPLUS is not set
+# CONFIG_HID_ROCCAT_KOVAPLUS is not set
 # CONFIG_HID_ROCCAT_PYRA is not set
 # CONFIG_HID_SAMSUNG is not set
 CONFIG_HID_SONY=y
@ -2166,6 +2207,7 @@ CONFIG_USB_UHCI_HCD=y
 #
 CONFIG_USB_STORAGE=y
 # CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_REALTEK is not set
 # CONFIG_USB_STORAGE_DATAFAB is not set
 # CONFIG_USB_STORAGE_FREECOM is not set
 # CONFIG_USB_STORAGE_ISD200 is not set
@ -2177,6 +2219,7 @@ CONFIG_USB_STORAGE=y
 # CONFIG_USB_STORAGE_ONETOUCH is not set
 # CONFIG_USB_STORAGE_KARMA is not set
 # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
+# CONFIG_USB_STORAGE_ENE_UB6250 is not set
 # CONFIG_USB_UAS is not set
 # CONFIG_USB_LIBUSUAL is not set

@ -2312,12 +2355,14 @@ CONFIG_MEMSTICK=m
 #
 # CONFIG_MEMSTICK_TIFM_MS is not set
 CONFIG_MEMSTICK_JMICRON_38X=m
+# CONFIG_MEMSTICK_R592 is not set
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y

 #
 # LED drivers
 #
+# CONFIG_LEDS_LM3530 is not set
 # CONFIG_LEDS_ALIX2 is not set
 # CONFIG_LEDS_PCA9532 is not set
 # CONFIG_LEDS_LP3944 is not set
@ -2418,13 +2463,14 @@ CONFIG_STAGING=y
 # CONFIG_STAGING_EXCLUDE_BUILD is not set
 # CONFIG_ET131X is not set
 # CONFIG_SLICOSS is not set
-# CONFIG_USB_DABUSB is not set
+CONFIG_DVB_CXD2099=m
+# CONFIG_USB_IP_COMMON is not set
 # CONFIG_W35UND is not set
 # CONFIG_PRISM2_USB is not set
 # CONFIG_ECHO is not set
 # CONFIG_BRCM80211 is not set
-CONFIG_RT2860=m
-CONFIG_RT2870=m
+# CONFIG_RT2860 is not set
+# CONFIG_RT2870 is not set
 # CONFIG_COMEDI is not set
 # CONFIG_ASUS_OLED is not set
 CONFIG_R8187SE=m
@ -2432,6 +2478,7 @@ CONFIG_RTL8192U=m
 CONFIG_RTL8192E=m
 CONFIG_R8712U=m
 CONFIG_R8712_AP=y
+# CONFIG_RTS_PSTOR is not set
 # CONFIG_TRANZPORT is not set
 # CONFIG_POHMELFS is not set
 # CONFIG_IDE_PHISON is not set
@ -2453,15 +2500,11 @@ CONFIG_VT6656=m
 # CONFIG_DX_SEP is not set
 # CONFIG_IIO is not set
 # CONFIG_CS5535_GPIO is not set
+# CONFIG_XVMALLOC is not set
 # CONFIG_ZRAM is not set
 # CONFIG_SAMSUNG_LAPTOP is not set
 # CONFIG_FB_SM7XX is not set
 # CONFIG_CRYSTALHD is not set
-
-#
-# Texas Instruments shared transport line discipline
-#
-# CONFIG_ST_BT is not set
 # CONFIG_FB_XGI is not set
 # CONFIG_LIRC_STAGING is not set
 # CONFIG_ACPI_QUICKSTART is not set
@ -2476,6 +2519,12 @@ CONFIG_MACH_NO_WESTBRIDGE=y
 #
 # CONFIG_SPEAKUP is not set
 # CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set
+# CONFIG_DRM_PSB is not set
+
+#
+# Altera FPGA firmware download module
+#
+# CONFIG_ALTERA_STAPL is not set
 # CONFIG_X86_PLATFORM_DEVICES is not set

 #
@ -2483,10 +2532,13 @@ CONFIG_MACH_NO_WESTBRIDGE=y
 #
 # CONFIG_EDD is not set
 # CONFIG_FIRMWARE_MEMMAP is not set
+CONFIG_EFI_VARS=y
 # CONFIG_DELL_RBU is not set
 # CONFIG_DCDBAS is not set
 CONFIG_DMIID=y
+# CONFIG_DMI_SYSFS is not set
 # CONFIG_ISCSI_IBFT_FIND is not set
+# CONFIG_SIGMA is not set

 #
 # File systems
@ -2554,6 +2606,7 @@ CONFIG_TMPFS=y
 # CONFIG_HUGETLB_PAGE is not set
 # CONFIG_CONFIGFS_FS is not set
 CONFIG_MISC_FILESYSTEMS=y
+# CONFIG_ADFS_FS is not set
 # CONFIG_AFFS_FS is not set
 # CONFIG_ECRYPT_FS is not set
 # CONFIG_HFS_FS is not set
@ -2574,7 +2627,9 @@ CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
 # CONFIG_OMFS_FS is not set
 # CONFIG_QNX4FS_FS is not set
 # CONFIG_ROMFS_FS is not set
+# CONFIG_PSTORE is not set
 # CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=y
 CONFIG_NFS_V3=y
@ -2673,6 +2728,7 @@ CONFIG_NLS_UTF8=y
 #
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_PRINTK_TIME=y
+CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
 # CONFIG_ENABLE_WARN_DEPRECATED is not set
 # CONFIG_ENABLE_MUST_CHECK is not set
 CONFIG_FRAME_WARN=1024
@ -2681,10 +2737,10 @@ CONFIG_FRAME_WARN=1024
 # CONFIG_UNUSED_SYMBOLS is not set
 # CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_SECTION_MISMATCH is not set
 # CONFIG_DEBUG_KERNEL is not set
 # CONFIG_HARDLOCKUP_DETECTOR is not set
 # CONFIG_SLUB_STATS is not set
-# CONFIG_BKL is not set
 # CONFIG_SPARSE_RCU_POINTER is not set
 # CONFIG_DEBUG_MEMORY_INIT is not set
 CONFIG_ARCH_WANT_FRAME_POINTERS=y
@ -2709,6 +2765,7 @@ CONFIG_TRACING_SUPPORT=y
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_ARCH_KGDB=y
 CONFIG_HAVE_ARCH_KMEMCHECK=y
+# CONFIG_TEST_KSTRTOX is not set
 CONFIG_STRICT_DEVMEM=y
 # CONFIG_X86_VERBOSE_BOOTUP is not set
 # CONFIG_EARLY_PRINTK is not set
@ -2876,5 +2933,6 @@ CONFIG_XZ_DEC_BCJ=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_DMA=y
+CONFIG_CPU_RMAP=y
 CONFIG_NLATTR=y
 CONFIG_AVERAGE=y
--- a/projects/Generic/options
+++ b/projects/Generic/options
@ -147,9 +147,6 @@
 # build and install SABnzbd Newsgroup downloader daemon (yes / no)
  SABNZBD="yes"

-# build and install SickBeard Newsgroup downloader daemon (yes / no)
-  SICKBEARD="yes"
-
 # build and install some tools for including in release (yes / no)
 # some of this tools are: htop, nano, wgetpaste
  TOOLS="yes"
--- a/projects/ION/linux/linux.i386.conf
+++ b/projects/ION/linux/linux.i386.conf
@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Linux/i386 2.6.38.2 Kernel Configuration
+# Linux/i386 2.6.39-rc3 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@ -46,7 +46,6 @@ CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_HAVE_INTEL_TXT=y
 CONFIG_X86_32_SMP=y
 CONFIG_X86_HT=y
-CONFIG_X86_TRAMPOLINE=y
 CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx"
 CONFIG_KTIME_SCALAR=y
 CONFIG_ARCH_CPU_PROBE_RELEASE=y
@ -80,6 +79,7 @@ CONFIG_POSIX_MQUEUE=y
 CONFIG_POSIX_MQUEUE_SYSCTL=y
 CONFIG_BSD_PROCESS_ACCT=y
 # CONFIG_BSD_PROCESS_ACCT_V3 is not set
+# CONFIG_FHANDLE is not set
 # CONFIG_TASKSTATS is not set
 # CONFIG_AUDIT is not set
 CONFIG_HAVE_GENERIC_HARDIRQS=y
@ -88,13 +88,11 @@ CONFIG_HAVE_GENERIC_HARDIRQS=y
 # IRQ subsystem
 #
 CONFIG_GENERIC_HARDIRQS=y
-# CONFIG_GENERIC_HARDIRQS_NO_DEPRECATED is not set
 CONFIG_HAVE_SPARSE_IRQ=y
 CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_IRQ_SHOW=y
 CONFIG_GENERIC_PENDING_IRQ=y
-# CONFIG_AUTO_IRQ_AFFINITY is not set
-# CONFIG_IRQ_PER_CPU is not set
-# CONFIG_HARDIRQS_SW_RESEND is not set
+CONFIG_IRQ_FORCED_THREADING=y
 # CONFIG_SPARSE_IRQ is not set

 #
@ -120,6 +118,7 @@ CONFIG_PROC_PID_CPUSET=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_RESOURCE_COUNTERS=y
 # CONFIG_CGROUP_MEM_RES_CTLR is not set
+# CONFIG_CGROUP_PERF is not set
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_RT_GROUP_SCHED=y
@ -292,7 +291,6 @@ CONFIG_NO_BOOTMEM=y
 # CONFIG_MCORE2 is not set
 CONFIG_MATOM=y
 # CONFIG_X86_GENERIC is not set
-CONFIG_X86_CPU=y
 CONFIG_X86_INTERNODE_CACHE_SHIFT=6
 CONFIG_X86_CMPXCHG=y
 CONFIG_CMPXCHG_LOCAL=y
@ -408,14 +406,13 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 #
 # Power management and ACPI options
 #
-CONFIG_PM=y
-# CONFIG_PM_DEBUG is not set
-CONFIG_PM_SLEEP_SMP=y
-CONFIG_PM_SLEEP=y
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
+CONFIG_PM_SLEEP=y
+CONFIG_PM_SLEEP_SMP=y
 CONFIG_PM_RUNTIME=y
-CONFIG_PM_OPS=y
+CONFIG_PM=y
+# CONFIG_PM_DEBUG is not set
 CONFIG_ACPI=y
 CONFIG_ACPI_SLEEP=y
 # CONFIG_ACPI_PROCFS is not set
@ -522,9 +519,9 @@ CONFIG_ISA_DMA_API=y
 # CONFIG_MCA is not set
 # CONFIG_SCx200 is not set
 # CONFIG_OLPC is not set
-# CONFIG_OLPC_OPENFIRMWARE is not set
 # CONFIG_PCCARD is not set
 # CONFIG_HOTPLUG_PCI is not set
+# CONFIG_RAPIDIO is not set

 #
 # Executable file formats / Emulations
@ -547,7 +544,6 @@ CONFIG_UNIX=y
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 # CONFIG_IP_ADVANCED_ROUTER is not set
-CONFIG_IP_FIB_HASH=y
 # CONFIG_IP_PNP is not set
 # CONFIG_NET_IPIP is not set
 # CONFIG_NET_IPGRE_DEMUX is not set
@ -603,6 +599,9 @@ CONFIG_IPV6_NDISC_NODETYPE=y
 # CONFIG_VLAN_8021Q is not set
 # CONFIG_DECNET is not set
 # CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
 # CONFIG_LAPB is not set
 # CONFIG_ECONET is not set
 # CONFIG_WAN_ROUTER is not set
@ -613,6 +612,7 @@ CONFIG_IPV6_NDISC_NODETYPE=y
 CONFIG_DNS_RESOLVER=y
 # CONFIG_BATMAN_ADV is not set
 CONFIG_RPS=y
+CONFIG_RFS_ACCEL=y
 CONFIG_XPS=y

 #
@ -623,8 +623,8 @@ CONFIG_XPS=y
 # CONFIG_CAN is not set
 # CONFIG_IRDA is not set
 CONFIG_BT=m
-CONFIG_BT_L2CAP=m
-CONFIG_BT_SCO=m
+CONFIG_BT_L2CAP=y
+CONFIG_BT_SCO=y
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BT_BNEP is not set
@ -696,6 +696,7 @@ CONFIG_FW_LOADER=y
 CONFIG_FIRMWARE_IN_KERNEL=y
 CONFIG_EXTRA_FIRMWARE=""
 # CONFIG_SYS_HYPERVISOR is not set
+CONFIG_ARCH_NO_SYSDEV_OPS=y
 # CONFIG_CONNECTOR is not set
 # CONFIG_MTD is not set
 # CONFIG_PARPORT is not set
@ -730,6 +731,7 @@ CONFIG_BLK_DEV_RAM_SIZE=16384
 # CONFIG_ATA_OVER_ETH is not set
 # CONFIG_BLK_DEV_HD is not set
 # CONFIG_BLK_DEV_RBD is not set
+# CONFIG_SENSORS_LIS3LV02D is not set
 CONFIG_MISC_DEVICES=y
 # CONFIG_AD525X_DPOT is not set
 # CONFIG_IBM_ASM is not set
@ -768,6 +770,7 @@ CONFIG_EEPROM_93CX6=m
 # Texas Instruments shared transport line discipline
 #
 # CONFIG_TI_ST is not set
+# CONFIG_SENSORS_LIS3_I2C is not set
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set

@ -853,6 +856,7 @@ CONFIG_SATA_NV=y
 #
 # CONFIG_PATA_ALI is not set
 # CONFIG_PATA_AMD is not set
+# CONFIG_PATA_ARASAN_CF is not set
 # CONFIG_PATA_ARTOP is not set
 # CONFIG_PATA_ATIIXP is not set
 # CONFIG_PATA_ATP867X is not set
@ -1033,7 +1037,8 @@ CONFIG_HOSTAP=m
 # CONFIG_HOSTAP_PCI is not set
 # CONFIG_IPW2100 is not set
 # CONFIG_IPW2200 is not set
-# CONFIG_IWLWIFI is not set
+# CONFIG_IWLAGN is not set
+# CONFIG_IWLWIFI_LEGACY is not set
 # CONFIG_IWM is not set
 # CONFIG_LIBERTAS is not set
 # CONFIG_HERMES is not set
@ -1042,17 +1047,29 @@ CONFIG_RT2X00=m
 # CONFIG_RT2400PCI is not set
 # CONFIG_RT2500PCI is not set
 # CONFIG_RT61PCI is not set
-# CONFIG_RT2800PCI is not set
+CONFIG_RT2800PCI=m
+# CONFIG_RT2800PCI_RT33XX is not set
+# CONFIG_RT2800PCI_RT35XX is not set
+# CONFIG_RT2800PCI_RT53XX is not set
 CONFIG_RT2500USB=m
 CONFIG_RT73USB=m
-# CONFIG_RT2800USB is not set
+CONFIG_RT2800USB=m
+# CONFIG_RT2800USB_RT33XX is not set
+# CONFIG_RT2800USB_RT35XX is not set
+# CONFIG_RT2800USB_UNKNOWN is not set
+CONFIG_RT2800_LIB=m
+CONFIG_RT2X00_LIB_PCI=m
 CONFIG_RT2X00_LIB_USB=m
 CONFIG_RT2X00_LIB=m
+CONFIG_RT2X00_LIB_HT=y
 CONFIG_RT2X00_LIB_FIRMWARE=y
 CONFIG_RT2X00_LIB_CRYPTO=y
 CONFIG_RT2X00_LIB_LEDS=y
 # CONFIG_RT2X00_DEBUG is not set
 # CONFIG_RTL8192CE is not set
+CONFIG_RTL8192CU=m
+CONFIG_RTLWIFI=m
+CONFIG_RTL8192C_COMMON=m
 # CONFIG_WL1251 is not set
 # CONFIG_WL12XX_MENU is not set
 CONFIG_ZD1211RW=m
@ -1114,6 +1131,7 @@ CONFIG_INPUT_EVDEV=y
 CONFIG_INPUT_KEYBOARD=y
 # CONFIG_KEYBOARD_ADP5588 is not set
 CONFIG_KEYBOARD_ATKBD=y
+# CONFIG_KEYBOARD_QT1070 is not set
 # CONFIG_KEYBOARD_QT2160 is not set
 # CONFIG_KEYBOARD_LKKBD is not set
 # CONFIG_KEYBOARD_TCA6416 is not set
@ -1206,10 +1224,13 @@ CONFIG_CONSOLE_TRANSLATIONS=y
 CONFIG_VT_CONSOLE=y
 CONFIG_HW_CONSOLE=y
 CONFIG_VT_HW_CONSOLE_BINDING=y
-# CONFIG_DEVKMEM is not set
+CONFIG_UNIX98_PTYS=y
+# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
+# CONFIG_LEGACY_PTYS is not set
 # CONFIG_SERIAL_NONSTANDARD is not set
-# CONFIG_N_GSM is not set
 # CONFIG_NOZOMI is not set
+# CONFIG_N_GSM is not set
+# CONFIG_DEVKMEM is not set

 #
 # Serial drivers
@ -1232,9 +1253,7 @@ CONFIG_SERIAL_CORE=y
 # CONFIG_SERIAL_TIMBERDALE is not set
 # CONFIG_SERIAL_ALTERA_JTAGUART is not set
 # CONFIG_SERIAL_ALTERA_UART is not set
-CONFIG_UNIX98_PTYS=y
-# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
-# CONFIG_LEGACY_PTYS is not set
+# CONFIG_SERIAL_PCH_UART is not set
 # CONFIG_TTY_PRINTK is not set
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_HW_RANDOM is not set
@ -1255,7 +1274,7 @@ CONFIG_DEVPORT=y
 CONFIG_I2C=y
 CONFIG_I2C_BOARDINFO=y
 # CONFIG_I2C_COMPAT is not set
-CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_CHARDEV=y
 # CONFIG_I2C_MUX is not set
 CONFIG_I2C_HELPER_AUTO=y

@ -1271,10 +1290,10 @@ CONFIG_I2C_HELPER_AUTO=y
 # CONFIG_I2C_ALI15X3 is not set
 # CONFIG_I2C_AMD756 is not set
 # CONFIG_I2C_AMD8111 is not set
-CONFIG_I2C_I801=m
-CONFIG_I2C_ISCH=m
+CONFIG_I2C_I801=y
+CONFIG_I2C_ISCH=y
 # CONFIG_I2C_PIIX4 is not set
-CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_NFORCE2=y
 # CONFIG_I2C_NFORCE2_S4985 is not set
 # CONFIG_I2C_SIS5595 is not set
 # CONFIG_I2C_SIS630 is not set
@ -1290,9 +1309,10 @@ CONFIG_I2C_NFORCE2=m
 #
 # I2C system bus drivers (mostly embedded / system-on-chip)
 #
-CONFIG_I2C_INTEL_MID=m
+CONFIG_I2C_INTEL_MID=y
 # CONFIG_I2C_OCORES is not set
 # CONFIG_I2C_PCA_PLATFORM is not set
+# CONFIG_I2C_PXA_PCI is not set
 # CONFIG_I2C_SIMTEC is not set
 # CONFIG_I2C_XILINX is not set
 # CONFIG_I2C_EG20T is not set
@ -1300,6 +1320,7 @@ CONFIG_I2C_INTEL_MID=m
 #
 # External I2C/SMBus adapter drivers
 #
+# CONFIG_I2C_DIOLAN_U2C is not set
 # CONFIG_I2C_PARPORT_LIGHT is not set
 # CONFIG_I2C_TAOS_EVM is not set
 # CONFIG_I2C_TINY_USB is not set
@ -1374,6 +1395,7 @@ CONFIG_SENSORS_CORETEMP=m
 CONFIG_SENSORS_PKGTEMP=m
 # CONFIG_SENSORS_IT87 is not set
 # CONFIG_SENSORS_JC42 is not set
+# CONFIG_SENSORS_LINEAGE is not set
 # CONFIG_SENSORS_LM63 is not set
 # CONFIG_SENSORS_LM73 is not set
 # CONFIG_SENSORS_LM75 is not set
@ -1386,15 +1408,18 @@ CONFIG_SENSORS_PKGTEMP=m
 # CONFIG_SENSORS_LM90 is not set
 # CONFIG_SENSORS_LM92 is not set
 # CONFIG_SENSORS_LM93 is not set
+# CONFIG_SENSORS_LTC4151 is not set
 # CONFIG_SENSORS_LTC4215 is not set
 # CONFIG_SENSORS_LTC4245 is not set
 # CONFIG_SENSORS_LTC4261 is not set
 # CONFIG_SENSORS_LM95241 is not set
 # CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_MAX6639 is not set
 # CONFIG_SENSORS_MAX6650 is not set
 # CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SENSORS_PC87427 is not set
 # CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_PMBUS is not set
 # CONFIG_SENSORS_SHT21 is not set
 # CONFIG_SENSORS_SIS5595 is not set
 # CONFIG_SENSORS_SMM665 is not set
@ -1404,6 +1429,8 @@ CONFIG_SENSORS_PKGTEMP=m
 # CONFIG_SENSORS_SMSC47M1 is not set
 # CONFIG_SENSORS_SMSC47M192 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_SCH5627 is not set
+# CONFIG_SENSORS_ADS1015 is not set
 # CONFIG_SENSORS_ADS7828 is not set
 # CONFIG_SENSORS_AMC6821 is not set
 # CONFIG_SENSORS_THMC50 is not set
@ -1423,14 +1450,12 @@ CONFIG_SENSORS_PKGTEMP=m
 # CONFIG_SENSORS_W83L786NG is not set
 # CONFIG_SENSORS_W83627HF is not set
 # CONFIG_SENSORS_W83627EHF is not set
-# CONFIG_SENSORS_LIS3_I2C is not set
 # CONFIG_SENSORS_APPLESMC is not set

 #
 # ACPI drivers
 #
 # CONFIG_SENSORS_ATK0110 is not set
-# CONFIG_SENSORS_LIS3LV02D is not set
 CONFIG_THERMAL=y
 CONFIG_THERMAL_HWMON=y
 # CONFIG_WATCHDOG is not set
@ -1441,10 +1466,11 @@ CONFIG_SSB_POSSIBLE=y
 #
 # CONFIG_SSB is not set
 CONFIG_MFD_SUPPORT=y
-CONFIG_MFD_CORE=m
+CONFIG_MFD_CORE=y
 # CONFIG_MFD_88PM860X is not set
 # CONFIG_MFD_SM501 is not set
 # CONFIG_HTC_PASIC3 is not set
+# CONFIG_TPS6105X is not set
 # CONFIG_TPS6507X is not set
 # CONFIG_TWL4030_CORE is not set
 # CONFIG_MFD_STMPE is not set
@ -1453,6 +1479,7 @@ CONFIG_MFD_CORE=m
 # CONFIG_PMIC_DA903X is not set
 # CONFIG_PMIC_ADP5520 is not set
 # CONFIG_MFD_MAX8925 is not set
+# CONFIG_MFD_MAX8997 is not set
 # CONFIG_MFD_MAX8998 is not set
 # CONFIG_MFD_WM8400 is not set
 # CONFIG_MFD_WM831X_I2C is not set
@ -1461,7 +1488,7 @@ CONFIG_MFD_CORE=m
 # CONFIG_MFD_PCF50633 is not set
 # CONFIG_ABX500_CORE is not set
 # CONFIG_MFD_CS5535 is not set
-CONFIG_LPC_SCH=m
+CONFIG_LPC_SCH=y
 # CONFIG_MFD_RDC321X is not set
 # CONFIG_MFD_JANZ_CMODIO is not set
 # CONFIG_MFD_VX855 is not set
@ -1472,6 +1499,7 @@ CONFIG_MEDIA_SUPPORT=y
 #
 # Multimedia core support
 #
+# CONFIG_MEDIA_CONTROLLER is not set
 # CONFIG_VIDEO_DEV is not set
 CONFIG_DVB_CORE=y
 CONFIG_VIDEO_MEDIA=y
@ -1493,8 +1521,8 @@ CONFIG_IR_RC5_SZ_DECODER=y
 CONFIG_IR_ENE=m
 CONFIG_IR_IMON=m
 CONFIG_IR_MCEUSB=m
-CONFIG_IR_NUVOTON=m
 CONFIG_IR_ITE_CIR=m
+CONFIG_IR_NUVOTON=m
 CONFIG_IR_STREAMZAP=m
 CONFIG_IR_WINBOND_CIR=m
 # CONFIG_RC_LOOPBACK is not set
@ -1566,6 +1594,7 @@ CONFIG_DVB_USB_AF9015=m
 # CONFIG_DVB_USB_EC168 is not set
 # CONFIG_DVB_USB_AZ6027 is not set
 # CONFIG_DVB_USB_LME2510 is not set
+CONFIG_DVB_USB_TECHNISAT_USB2=m
 # CONFIG_DVB_TTUSB_BUDGET is not set
 # CONFIG_DVB_TTUSB_DEC is not set
 CONFIG_SMS_SIANO_MDTV=m
@ -1594,6 +1623,10 @@ CONFIG_SMS_SDIO_DRV=m
 # Supported SDMC DM1105 Adapters
 #
 # CONFIG_DVB_DM1105 is not set
+
+#
+# Supported FireWire (IEEE 1394) Adapters
+#
 # CONFIG_DVB_FIREDTV is not set

 #
@ -1917,6 +1950,8 @@ CONFIG_SND_USB_AUDIO=m
 # CONFIG_SND_USB_USX2Y is not set
 # CONFIG_SND_USB_CAIAQ is not set
 # CONFIG_SND_USB_US122L is not set
+# CONFIG_SND_USB_6FIRE is not set
+# CONFIG_SND_FIREWIRE is not set
 # CONFIG_SND_SOC is not set
 # CONFIG_SOUND_PRIME is not set
 CONFIG_HID_SUPPORT=y
@ -1946,15 +1981,16 @@ CONFIG_HID_AUREAL=y
 # CONFIG_HID_CYPRESS is not set
 # CONFIG_HID_DRAGONRISE is not set
 # CONFIG_HID_EMS_FF is not set
-# CONFIG_HID_EGALAX is not set
 # CONFIG_HID_ELECOM is not set
 # CONFIG_HID_EZKEY is not set
+# CONFIG_HID_KEYTOUCH is not set
 # CONFIG_HID_KYE is not set
 # CONFIG_HID_UCLOGIC is not set
 # CONFIG_HID_WALTOP is not set
 # CONFIG_HID_GYRATION is not set
 CONFIG_HID_TWINHAN=y
 # CONFIG_HID_KENSINGTON is not set
+# CONFIG_HID_LCPOWER is not set
 CONFIG_HID_LOGITECH=y
 CONFIG_LOGITECH_FF=y
 CONFIG_LOGIRUMBLEPAD2_FF=y
@ -1972,8 +2008,10 @@ CONFIG_HID_MICROSOFT=y
 # CONFIG_HID_PICOLCD is not set
 # CONFIG_HID_QUANTA is not set
 # CONFIG_HID_ROCCAT is not set
+# CONFIG_HID_ROCCAT_ARVO is not set
 # CONFIG_HID_ROCCAT_KONE is not set
 # CONFIG_HID_ROCCAT_KONEPLUS is not set
+# CONFIG_HID_ROCCAT_KOVAPLUS is not set
 # CONFIG_HID_ROCCAT_PYRA is not set
 # CONFIG_HID_SAMSUNG is not set
 CONFIG_HID_SONY=y
@ -2047,6 +2085,7 @@ CONFIG_USB_UHCI_HCD=y
 #
 CONFIG_USB_STORAGE=y
 # CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_REALTEK is not set
 # CONFIG_USB_STORAGE_DATAFAB is not set
 # CONFIG_USB_STORAGE_FREECOM is not set
 # CONFIG_USB_STORAGE_ISD200 is not set
@ -2058,6 +2097,7 @@ CONFIG_USB_STORAGE=y
 # CONFIG_USB_STORAGE_ONETOUCH is not set
 # CONFIG_USB_STORAGE_KARMA is not set
 # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
+# CONFIG_USB_STORAGE_ENE_UB6250 is not set
 # CONFIG_USB_UAS is not set
 # CONFIG_USB_LIBUSUAL is not set

@ -2193,12 +2233,14 @@ CONFIG_MEMSTICK=m
 #
 # CONFIG_MEMSTICK_TIFM_MS is not set
 CONFIG_MEMSTICK_JMICRON_38X=m
+# CONFIG_MEMSTICK_R592 is not set
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y

 #
 # LED drivers
 #
+# CONFIG_LEDS_LM3530 is not set
 # CONFIG_LEDS_ALIX2 is not set
 # CONFIG_LEDS_PCA9532 is not set
 # CONFIG_LEDS_LP3944 is not set
@ -2292,13 +2334,14 @@ CONFIG_STAGING=y
 # CONFIG_STAGING_EXCLUDE_BUILD is not set
 # CONFIG_ET131X is not set
 # CONFIG_SLICOSS is not set
-# CONFIG_USB_DABUSB is not set
+CONFIG_DVB_CXD2099=m
+# CONFIG_USB_IP_COMMON is not set
 # CONFIG_W35UND is not set
 # CONFIG_PRISM2_USB is not set
 # CONFIG_ECHO is not set
 # CONFIG_BRCM80211 is not set
-CONFIG_RT2860=m
-CONFIG_RT2870=m
+# CONFIG_RT2860 is not set
+# CONFIG_RT2870 is not set
 # CONFIG_COMEDI is not set
 # CONFIG_ASUS_OLED is not set
 CONFIG_R8187SE=m
@ -2306,6 +2349,7 @@ CONFIG_RTL8192U=m
 CONFIG_RTL8192E=m
 CONFIG_R8712U=m
 CONFIG_R8712_AP=y
+# CONFIG_RTS_PSTOR is not set
 # CONFIG_TRANZPORT is not set
 # CONFIG_POHMELFS is not set
 # CONFIG_IDE_PHISON is not set
@ -2319,14 +2363,10 @@ CONFIG_VT6656=m
 # CONFIG_DX_SEP is not set
 # CONFIG_IIO is not set
 # CONFIG_CS5535_GPIO is not set
+# CONFIG_XVMALLOC is not set
 # CONFIG_ZRAM is not set
 # CONFIG_FB_SM7XX is not set
 # CONFIG_CRYSTALHD is not set
-
-#
-# Texas Instruments shared transport line discipline
-#
-# CONFIG_ST_BT is not set
 # CONFIG_FB_XGI is not set
 # CONFIG_LIRC_STAGING is not set
 # CONFIG_ACPI_QUICKSTART is not set
@ -2341,6 +2381,11 @@ CONFIG_MACH_NO_WESTBRIDGE=y
 #
 # CONFIG_SPEAKUP is not set
 # CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set
+
+#
+# Altera FPGA firmware download module
+#
+# CONFIG_ALTERA_STAPL is not set
 # CONFIG_X86_PLATFORM_DEVICES is not set

 #
@ -2351,7 +2396,9 @@ CONFIG_MACH_NO_WESTBRIDGE=y
 # CONFIG_DELL_RBU is not set
 # CONFIG_DCDBAS is not set
 CONFIG_DMIID=y
+# CONFIG_DMI_SYSFS is not set
 # CONFIG_ISCSI_IBFT_FIND is not set
+# CONFIG_SIGMA is not set

 #
 # File systems
@ -2419,6 +2466,7 @@ CONFIG_TMPFS=y
 # CONFIG_HUGETLB_PAGE is not set
 # CONFIG_CONFIGFS_FS is not set
 CONFIG_MISC_FILESYSTEMS=y
+# CONFIG_ADFS_FS is not set
 # CONFIG_AFFS_FS is not set
 # CONFIG_ECRYPT_FS is not set
 # CONFIG_HFS_FS is not set
@ -2439,7 +2487,9 @@ CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
 # CONFIG_OMFS_FS is not set
 # CONFIG_QNX4FS_FS is not set
 # CONFIG_ROMFS_FS is not set
+# CONFIG_PSTORE is not set
 # CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=y
 CONFIG_NFS_V3=y
@ -2538,6 +2588,7 @@ CONFIG_NLS_UTF8=y
 #
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_PRINTK_TIME=y
+CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
 # CONFIG_ENABLE_WARN_DEPRECATED is not set
 # CONFIG_ENABLE_MUST_CHECK is not set
 CONFIG_FRAME_WARN=1024
@ -2546,10 +2597,10 @@ CONFIG_FRAME_WARN=1024
 # CONFIG_UNUSED_SYMBOLS is not set
 # CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_SECTION_MISMATCH is not set
 # CONFIG_DEBUG_KERNEL is not set
 # CONFIG_HARDLOCKUP_DETECTOR is not set
 # CONFIG_SLUB_STATS is not set
-# CONFIG_BKL is not set
 # CONFIG_SPARSE_RCU_POINTER is not set
 # CONFIG_DEBUG_MEMORY_INIT is not set
 CONFIG_ARCH_WANT_FRAME_POINTERS=y
@ -2574,6 +2625,7 @@ CONFIG_TRACING_SUPPORT=y
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_ARCH_KGDB=y
 CONFIG_HAVE_ARCH_KMEMCHECK=y
+# CONFIG_TEST_KSTRTOX is not set
 CONFIG_STRICT_DEVMEM=y
 # CONFIG_X86_VERBOSE_BOOTUP is not set
 # CONFIG_EARLY_PRINTK is not set
@ -2740,5 +2792,6 @@ CONFIG_XZ_DEC_BCJ=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_DMA=y
+CONFIG_CPU_RMAP=y
 CONFIG_NLATTR=y
 CONFIG_AVERAGE=y
--- a/projects/ION/linux/linux.x86_64.conf
+++ b/projects/ION/linux/linux.x86_64.conf
@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Linux/x86_64 2.6.38.2 Kernel Configuration
+# Linux/x86_64 2.6.39-rc3 Kernel Configuration
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@ -46,7 +46,6 @@ CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_HAVE_INTEL_TXT=y
 CONFIG_X86_64_SMP=y
 CONFIG_X86_HT=y
-CONFIG_X86_TRAMPOLINE=y
 CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11"
 # CONFIG_KTIME_SCALAR is not set
 CONFIG_ARCH_CPU_PROBE_RELEASE=y
@ -80,6 +79,7 @@ CONFIG_POSIX_MQUEUE=y
 CONFIG_POSIX_MQUEUE_SYSCTL=y
 CONFIG_BSD_PROCESS_ACCT=y
 # CONFIG_BSD_PROCESS_ACCT_V3 is not set
+# CONFIG_FHANDLE is not set
 # CONFIG_TASKSTATS is not set
 # CONFIG_AUDIT is not set
 CONFIG_HAVE_GENERIC_HARDIRQS=y
@ -88,13 +88,11 @@ CONFIG_HAVE_GENERIC_HARDIRQS=y
 # IRQ subsystem
 #
 CONFIG_GENERIC_HARDIRQS=y
-# CONFIG_GENERIC_HARDIRQS_NO_DEPRECATED is not set
 CONFIG_HAVE_SPARSE_IRQ=y
 CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_IRQ_SHOW=y
 CONFIG_GENERIC_PENDING_IRQ=y
-# CONFIG_AUTO_IRQ_AFFINITY is not set
-# CONFIG_IRQ_PER_CPU is not set
-# CONFIG_HARDIRQS_SW_RESEND is not set
+CONFIG_IRQ_FORCED_THREADING=y
 # CONFIG_SPARSE_IRQ is not set

 #
@ -120,6 +118,7 @@ CONFIG_PROC_PID_CPUSET=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_RESOURCE_COUNTERS=y
 # CONFIG_CGROUP_MEM_RES_CTLR is not set
+# CONFIG_CGROUP_PERF is not set
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_RT_GROUP_SCHED=y
@ -268,7 +267,6 @@ CONFIG_NO_BOOTMEM=y
 # CONFIG_MCORE2 is not set
 CONFIG_MATOM=y
 # CONFIG_GENERIC_CPU is not set
-CONFIG_X86_CPU=y
 CONFIG_X86_INTERNODE_CACHE_SHIFT=6
 CONFIG_X86_CMPXCHG=y
 CONFIG_CMPXCHG_LOCAL=y
@ -371,14 +369,13 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 #
 # Power management and ACPI options
 #
-CONFIG_PM=y
-# CONFIG_PM_DEBUG is not set
-CONFIG_PM_SLEEP_SMP=y
-CONFIG_PM_SLEEP=y
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
+CONFIG_PM_SLEEP=y
+CONFIG_PM_SLEEP_SMP=y
 CONFIG_PM_RUNTIME=y
-CONFIG_PM_OPS=y
+CONFIG_PM=y
+# CONFIG_PM_DEBUG is not set
 CONFIG_ACPI=y
 CONFIG_ACPI_SLEEP=y
 # CONFIG_ACPI_PROCFS is not set
@ -474,6 +471,7 @@ CONFIG_PCI_IOAPIC=y
 CONFIG_ISA_DMA_API=y
 # CONFIG_PCCARD is not set
 # CONFIG_HOTPLUG_PCI is not set
+# CONFIG_RAPIDIO is not set

 #
 # Executable file formats / Emulations
@ -496,7 +494,6 @@ CONFIG_UNIX=y
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 # CONFIG_IP_ADVANCED_ROUTER is not set
-CONFIG_IP_FIB_HASH=y
 # CONFIG_IP_PNP is not set
 # CONFIG_NET_IPIP is not set
 # CONFIG_NET_IPGRE_DEMUX is not set
@ -552,6 +549,9 @@ CONFIG_IPV6_NDISC_NODETYPE=y
 # CONFIG_VLAN_8021Q is not set
 # CONFIG_DECNET is not set
 # CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
 # CONFIG_LAPB is not set
 # CONFIG_ECONET is not set
 # CONFIG_WAN_ROUTER is not set
@ -562,6 +562,7 @@ CONFIG_IPV6_NDISC_NODETYPE=y
 CONFIG_DNS_RESOLVER=y
 # CONFIG_BATMAN_ADV is not set
 CONFIG_RPS=y
+CONFIG_RFS_ACCEL=y
 CONFIG_XPS=y

 #
@ -572,8 +573,8 @@ CONFIG_XPS=y
 # CONFIG_CAN is not set
 # CONFIG_IRDA is not set
 CONFIG_BT=m
-CONFIG_BT_L2CAP=m
-CONFIG_BT_SCO=m
+CONFIG_BT_L2CAP=y
+CONFIG_BT_SCO=y
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BT_BNEP is not set
@ -645,6 +646,7 @@ CONFIG_FW_LOADER=y
 CONFIG_FIRMWARE_IN_KERNEL=y
 CONFIG_EXTRA_FIRMWARE=""
 # CONFIG_SYS_HYPERVISOR is not set
+CONFIG_ARCH_NO_SYSDEV_OPS=y
 # CONFIG_CONNECTOR is not set
 # CONFIG_MTD is not set
 # CONFIG_PARPORT is not set
@ -679,6 +681,7 @@ CONFIG_BLK_DEV_RAM_SIZE=16384
 # CONFIG_ATA_OVER_ETH is not set
 # CONFIG_BLK_DEV_HD is not set
 # CONFIG_BLK_DEV_RBD is not set
+# CONFIG_SENSORS_LIS3LV02D is not set
 CONFIG_MISC_DEVICES=y
 # CONFIG_AD525X_DPOT is not set
 # CONFIG_IBM_ASM is not set
@ -717,6 +720,7 @@ CONFIG_EEPROM_93CX6=m
 # Texas Instruments shared transport line discipline
 #
 # CONFIG_TI_ST is not set
+# CONFIG_SENSORS_LIS3_I2C is not set
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set

@ -802,6 +806,7 @@ CONFIG_SATA_NV=y
 #
 # CONFIG_PATA_ALI is not set
 # CONFIG_PATA_AMD is not set
+# CONFIG_PATA_ARASAN_CF is not set
 # CONFIG_PATA_ARTOP is not set
 # CONFIG_PATA_ATIIXP is not set
 # CONFIG_PATA_ATP867X is not set
@ -981,7 +986,8 @@ CONFIG_HOSTAP=m
 # CONFIG_HOSTAP_PCI is not set
 # CONFIG_IPW2100 is not set
 # CONFIG_IPW2200 is not set
-# CONFIG_IWLWIFI is not set
+# CONFIG_IWLAGN is not set
+# CONFIG_IWLWIFI_LEGACY is not set
 # CONFIG_IWM is not set
 # CONFIG_LIBERTAS is not set
 # CONFIG_HERMES is not set
@ -990,17 +996,29 @@ CONFIG_RT2X00=m
 # CONFIG_RT2400PCI is not set
 # CONFIG_RT2500PCI is not set
 # CONFIG_RT61PCI is not set
-# CONFIG_RT2800PCI is not set
+CONFIG_RT2800PCI=m
+# CONFIG_RT2800PCI_RT33XX is not set
+# CONFIG_RT2800PCI_RT35XX is not set
+# CONFIG_RT2800PCI_RT53XX is not set
 CONFIG_RT2500USB=m
 CONFIG_RT73USB=m
-# CONFIG_RT2800USB is not set
+CONFIG_RT2800USB=m
+# CONFIG_RT2800USB_RT33XX is not set
+# CONFIG_RT2800USB_RT35XX is not set
+# CONFIG_RT2800USB_UNKNOWN is not set
+CONFIG_RT2800_LIB=m
+CONFIG_RT2X00_LIB_PCI=m
 CONFIG_RT2X00_LIB_USB=m
 CONFIG_RT2X00_LIB=m
+CONFIG_RT2X00_LIB_HT=y
 CONFIG_RT2X00_LIB_FIRMWARE=y
 CONFIG_RT2X00_LIB_CRYPTO=y
 CONFIG_RT2X00_LIB_LEDS=y
 # CONFIG_RT2X00_DEBUG is not set
 # CONFIG_RTL8192CE is not set
+CONFIG_RTL8192CU=m
+CONFIG_RTLWIFI=m
+CONFIG_RTL8192C_COMMON=m
 # CONFIG_WL1251 is not set
 # CONFIG_WL12XX_MENU is not set
 CONFIG_ZD1211RW=m
@ -1062,6 +1080,7 @@ CONFIG_INPUT_EVDEV=y
 CONFIG_INPUT_KEYBOARD=y
 # CONFIG_KEYBOARD_ADP5588 is not set
 CONFIG_KEYBOARD_ATKBD=y
+# CONFIG_KEYBOARD_QT1070 is not set
 # CONFIG_KEYBOARD_QT2160 is not set
 # CONFIG_KEYBOARD_LKKBD is not set
 # CONFIG_KEYBOARD_TCA6416 is not set
@ -1153,10 +1172,13 @@ CONFIG_CONSOLE_TRANSLATIONS=y
 CONFIG_VT_CONSOLE=y
 CONFIG_HW_CONSOLE=y
 CONFIG_VT_HW_CONSOLE_BINDING=y
-# CONFIG_DEVKMEM is not set
+CONFIG_UNIX98_PTYS=y
+# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
+# CONFIG_LEGACY_PTYS is not set
 # CONFIG_SERIAL_NONSTANDARD is not set
-# CONFIG_N_GSM is not set
 # CONFIG_NOZOMI is not set
+# CONFIG_N_GSM is not set
+# CONFIG_DEVKMEM is not set

 #
 # Serial drivers
@ -1178,9 +1200,7 @@ CONFIG_SERIAL_CORE=m
 # CONFIG_SERIAL_TIMBERDALE is not set
 # CONFIG_SERIAL_ALTERA_JTAGUART is not set
 # CONFIG_SERIAL_ALTERA_UART is not set
-CONFIG_UNIX98_PTYS=y
-# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
-# CONFIG_LEGACY_PTYS is not set
+# CONFIG_SERIAL_PCH_UART is not set
 # CONFIG_TTY_PRINTK is not set
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_HW_RANDOM is not set
@ -1198,7 +1218,7 @@ CONFIG_DEVPORT=y
 CONFIG_I2C=y
 CONFIG_I2C_BOARDINFO=y
 # CONFIG_I2C_COMPAT is not set
-CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_CHARDEV=y
 # CONFIG_I2C_MUX is not set
 CONFIG_I2C_HELPER_AUTO=y

@ -1214,10 +1234,10 @@ CONFIG_I2C_HELPER_AUTO=y
 # CONFIG_I2C_ALI15X3 is not set
 # CONFIG_I2C_AMD756 is not set
 # CONFIG_I2C_AMD8111 is not set
-CONFIG_I2C_I801=m
-CONFIG_I2C_ISCH=m
+CONFIG_I2C_I801=y
+CONFIG_I2C_ISCH=y
 # CONFIG_I2C_PIIX4 is not set
-CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_NFORCE2=y
 # CONFIG_I2C_NFORCE2_S4985 is not set
 # CONFIG_I2C_SIS5595 is not set
 # CONFIG_I2C_SIS630 is not set
@ -1233,9 +1253,10 @@ CONFIG_I2C_NFORCE2=m
 #
 # I2C system bus drivers (mostly embedded / system-on-chip)
 #
-CONFIG_I2C_INTEL_MID=m
+CONFIG_I2C_INTEL_MID=y
 # CONFIG_I2C_OCORES is not set
 # CONFIG_I2C_PCA_PLATFORM is not set
+# CONFIG_I2C_PXA_PCI is not set
 # CONFIG_I2C_SIMTEC is not set
 # CONFIG_I2C_XILINX is not set
 # CONFIG_I2C_EG20T is not set
@ -1243,6 +1264,7 @@ CONFIG_I2C_INTEL_MID=m
 #
 # External I2C/SMBus adapter drivers
 #
+# CONFIG_I2C_DIOLAN_U2C is not set
 # CONFIG_I2C_PARPORT_LIGHT is not set
 # CONFIG_I2C_TAOS_EVM is not set
 # CONFIG_I2C_TINY_USB is not set
@ -1316,6 +1338,7 @@ CONFIG_SENSORS_CORETEMP=m
 CONFIG_SENSORS_PKGTEMP=m
 # CONFIG_SENSORS_IT87 is not set
 # CONFIG_SENSORS_JC42 is not set
+# CONFIG_SENSORS_LINEAGE is not set
 # CONFIG_SENSORS_LM63 is not set
 # CONFIG_SENSORS_LM73 is not set
 # CONFIG_SENSORS_LM75 is not set
@ -1328,15 +1351,18 @@ CONFIG_SENSORS_PKGTEMP=m
 # CONFIG_SENSORS_LM90 is not set
 # CONFIG_SENSORS_LM92 is not set
 # CONFIG_SENSORS_LM93 is not set
+# CONFIG_SENSORS_LTC4151 is not set
 # CONFIG_SENSORS_LTC4215 is not set
 # CONFIG_SENSORS_LTC4245 is not set
 # CONFIG_SENSORS_LTC4261 is not set
 # CONFIG_SENSORS_LM95241 is not set
 # CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_MAX6639 is not set
 # CONFIG_SENSORS_MAX6650 is not set
 # CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SENSORS_PC87427 is not set
 # CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_PMBUS is not set
 # CONFIG_SENSORS_SHT21 is not set
 # CONFIG_SENSORS_SIS5595 is not set
 # CONFIG_SENSORS_SMM665 is not set
@ -1346,6 +1372,8 @@ CONFIG_SENSORS_PKGTEMP=m
 # CONFIG_SENSORS_SMSC47M1 is not set
 # CONFIG_SENSORS_SMSC47M192 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_SCH5627 is not set
+# CONFIG_SENSORS_ADS1015 is not set
 # CONFIG_SENSORS_ADS7828 is not set
 # CONFIG_SENSORS_AMC6821 is not set
 # CONFIG_SENSORS_THMC50 is not set
@ -1365,14 +1393,12 @@ CONFIG_SENSORS_PKGTEMP=m
 # CONFIG_SENSORS_W83L786NG is not set
 # CONFIG_SENSORS_W83627HF is not set
 # CONFIG_SENSORS_W83627EHF is not set
-# CONFIG_SENSORS_LIS3_I2C is not set
 # CONFIG_SENSORS_APPLESMC is not set

 #
 # ACPI drivers
 #
 # CONFIG_SENSORS_ATK0110 is not set
-# CONFIG_SENSORS_LIS3LV02D is not set
 CONFIG_THERMAL=y
 CONFIG_THERMAL_HWMON=y
 # CONFIG_WATCHDOG is not set
@ -1383,10 +1409,11 @@ CONFIG_SSB_POSSIBLE=y
 #
 # CONFIG_SSB is not set
 CONFIG_MFD_SUPPORT=y
-CONFIG_MFD_CORE=m
+CONFIG_MFD_CORE=y
 # CONFIG_MFD_88PM860X is not set
 # CONFIG_MFD_SM501 is not set
 # CONFIG_HTC_PASIC3 is not set
+# CONFIG_TPS6105X is not set
 # CONFIG_TPS6507X is not set
 # CONFIG_TWL4030_CORE is not set
 # CONFIG_MFD_STMPE is not set
@ -1395,6 +1422,7 @@ CONFIG_MFD_CORE=m
 # CONFIG_PMIC_DA903X is not set
 # CONFIG_PMIC_ADP5520 is not set
 # CONFIG_MFD_MAX8925 is not set
+# CONFIG_MFD_MAX8997 is not set
 # CONFIG_MFD_MAX8998 is not set
 # CONFIG_MFD_WM8400 is not set
 # CONFIG_MFD_WM831X_I2C is not set
@ -1403,7 +1431,7 @@ CONFIG_MFD_CORE=m
 # CONFIG_MFD_PCF50633 is not set
 # CONFIG_ABX500_CORE is not set
 # CONFIG_MFD_CS5535 is not set
-CONFIG_LPC_SCH=m
+CONFIG_LPC_SCH=y
 # CONFIG_MFD_RDC321X is not set
 # CONFIG_MFD_JANZ_CMODIO is not set
 # CONFIG_MFD_VX855 is not set
@ -1414,6 +1442,7 @@ CONFIG_MEDIA_SUPPORT=y
 #
 # Multimedia core support
 #
+# CONFIG_MEDIA_CONTROLLER is not set
 # CONFIG_VIDEO_DEV is not set
 CONFIG_DVB_CORE=y
 CONFIG_VIDEO_MEDIA=y
@ -1435,8 +1464,8 @@ CONFIG_IR_RC5_SZ_DECODER=y
 CONFIG_IR_ENE=m
 CONFIG_IR_IMON=m
 CONFIG_IR_MCEUSB=m
-CONFIG_IR_NUVOTON=m
 CONFIG_IR_ITE_CIR=m
+CONFIG_IR_NUVOTON=m
 CONFIG_IR_STREAMZAP=m
 CONFIG_IR_WINBOND_CIR=m
 # CONFIG_RC_LOOPBACK is not set
@ -1508,6 +1537,7 @@ CONFIG_DVB_USB_AF9015=m
 # CONFIG_DVB_USB_EC168 is not set
 # CONFIG_DVB_USB_AZ6027 is not set
 # CONFIG_DVB_USB_LME2510 is not set
+CONFIG_DVB_USB_TECHNISAT_USB2=m
 # CONFIG_DVB_TTUSB_BUDGET is not set
 # CONFIG_DVB_TTUSB_DEC is not set
 CONFIG_SMS_SIANO_MDTV=m
@ -1536,6 +1566,10 @@ CONFIG_SMS_SDIO_DRV=m
 # Supported SDMC DM1105 Adapters
 #
 # CONFIG_DVB_DM1105 is not set
+
+#
+# Supported FireWire (IEEE 1394) Adapters
+#
 # CONFIG_DVB_FIREDTV is not set

 #
@ -1851,6 +1885,8 @@ CONFIG_SND_USB_AUDIO=m
 # CONFIG_SND_USB_USX2Y is not set
 # CONFIG_SND_USB_CAIAQ is not set
 # CONFIG_SND_USB_US122L is not set
+# CONFIG_SND_USB_6FIRE is not set
+# CONFIG_SND_FIREWIRE is not set
 # CONFIG_SND_SOC is not set
 # CONFIG_SOUND_PRIME is not set
 CONFIG_HID_SUPPORT=y
@ -1880,15 +1916,16 @@ CONFIG_HID_AUREAL=y
 # CONFIG_HID_CYPRESS is not set
 # CONFIG_HID_DRAGONRISE is not set
 # CONFIG_HID_EMS_FF is not set
-# CONFIG_HID_EGALAX is not set
 # CONFIG_HID_ELECOM is not set
 # CONFIG_HID_EZKEY is not set
+# CONFIG_HID_KEYTOUCH is not set
 # CONFIG_HID_KYE is not set
 # CONFIG_HID_UCLOGIC is not set
 # CONFIG_HID_WALTOP is not set
 # CONFIG_HID_GYRATION is not set
 CONFIG_HID_TWINHAN=y
 # CONFIG_HID_KENSINGTON is not set
+# CONFIG_HID_LCPOWER is not set
 CONFIG_HID_LOGITECH=y
 CONFIG_LOGITECH_FF=y
 CONFIG_LOGIRUMBLEPAD2_FF=y
@ -1906,8 +1943,10 @@ CONFIG_HID_MICROSOFT=y
 # CONFIG_HID_PICOLCD is not set
 # CONFIG_HID_QUANTA is not set
 # CONFIG_HID_ROCCAT is not set
+# CONFIG_HID_ROCCAT_ARVO is not set
 # CONFIG_HID_ROCCAT_KONE is not set
 # CONFIG_HID_ROCCAT_KONEPLUS is not set
+# CONFIG_HID_ROCCAT_KOVAPLUS is not set
 # CONFIG_HID_ROCCAT_PYRA is not set
 # CONFIG_HID_SAMSUNG is not set
 CONFIG_HID_SONY=y
@ -1981,6 +2020,7 @@ CONFIG_USB_UHCI_HCD=y
 #
 CONFIG_USB_STORAGE=y
 # CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_REALTEK is not set
 # CONFIG_USB_STORAGE_DATAFAB is not set
 # CONFIG_USB_STORAGE_FREECOM is not set
 # CONFIG_USB_STORAGE_ISD200 is not set
@ -1992,6 +2032,7 @@ CONFIG_USB_STORAGE=y
 # CONFIG_USB_STORAGE_ONETOUCH is not set
 # CONFIG_USB_STORAGE_KARMA is not set
 # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
+# CONFIG_USB_STORAGE_ENE_UB6250 is not set
 # CONFIG_USB_UAS is not set
 # CONFIG_USB_LIBUSUAL is not set

@ -2127,12 +2168,14 @@ CONFIG_MEMSTICK=m
 #
 # CONFIG_MEMSTICK_TIFM_MS is not set
 CONFIG_MEMSTICK_JMICRON_38X=m
+# CONFIG_MEMSTICK_R592 is not set
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y

 #
 # LED drivers
 #
+# CONFIG_LEDS_LM3530 is not set
 # CONFIG_LEDS_ALIX2 is not set
 # CONFIG_LEDS_PCA9532 is not set
 # CONFIG_LEDS_LP3944 is not set
@ -2226,13 +2269,14 @@ CONFIG_STAGING=y
 # CONFIG_STAGING_EXCLUDE_BUILD is not set
 # CONFIG_ET131X is not set
 # CONFIG_SLICOSS is not set
-# CONFIG_USB_DABUSB is not set
+CONFIG_DVB_CXD2099=m
+# CONFIG_USB_IP_COMMON is not set
 # CONFIG_W35UND is not set
 # CONFIG_PRISM2_USB is not set
 # CONFIG_ECHO is not set
 # CONFIG_BRCM80211 is not set
-CONFIG_RT2860=m
-CONFIG_RT2870=m
+# CONFIG_RT2860 is not set
+# CONFIG_RT2870 is not set
 # CONFIG_COMEDI is not set
 # CONFIG_ASUS_OLED is not set
 CONFIG_R8187SE=m
@ -2240,6 +2284,7 @@ CONFIG_RTL8192U=m
 CONFIG_RTL8192E=m
 CONFIG_R8712U=m
 CONFIG_R8712_AP=y
+# CONFIG_RTS_PSTOR is not set
 # CONFIG_TRANZPORT is not set
 # CONFIG_POHMELFS is not set
 # CONFIG_IDE_PHISON is not set
@ -2252,20 +2297,15 @@ CONFIG_VT6656=m
 # CONFIG_VME_BUS is not set
 # CONFIG_DX_SEP is not set
 # CONFIG_IIO is not set
+# CONFIG_XVMALLOC is not set
 # CONFIG_ZRAM is not set
 # CONFIG_FB_SM7XX is not set
 # CONFIG_CRYSTALHD is not set
-
-#
-# Texas Instruments shared transport line discipline
-#
-# CONFIG_ST_BT is not set
 # CONFIG_FB_XGI is not set
 CONFIG_LIRC_STAGING=y
 # CONFIG_LIRC_BT829 is not set
 CONFIG_LIRC_IGORPLUGUSB=m
 # CONFIG_LIRC_IMON is not set
-# CONFIG_LIRC_ITE8709 is not set
 # CONFIG_LIRC_SASEM is not set
 CONFIG_LIRC_SERIAL=m
 CONFIG_LIRC_SERIAL_TRANSMITTER=y
@ -2284,6 +2324,11 @@ CONFIG_MACH_NO_WESTBRIDGE=y
 #
 # CONFIG_SPEAKUP is not set
 # CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set
+
+#
+# Altera FPGA firmware download module
+#
+# CONFIG_ALTERA_STAPL is not set
 # CONFIG_X86_PLATFORM_DEVICES is not set

 #
@ -2294,7 +2339,9 @@ CONFIG_MACH_NO_WESTBRIDGE=y
 # CONFIG_DELL_RBU is not set
 # CONFIG_DCDBAS is not set
 CONFIG_DMIID=y
+# CONFIG_DMI_SYSFS is not set
 # CONFIG_ISCSI_IBFT_FIND is not set
+# CONFIG_SIGMA is not set

 #
 # File systems
@ -2362,6 +2409,7 @@ CONFIG_TMPFS=y
 # CONFIG_HUGETLB_PAGE is not set
 # CONFIG_CONFIGFS_FS is not set
 CONFIG_MISC_FILESYSTEMS=y
+# CONFIG_ADFS_FS is not set
 # CONFIG_AFFS_FS is not set
 # CONFIG_ECRYPT_FS is not set
 # CONFIG_HFS_FS is not set
@ -2382,7 +2430,9 @@ CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
 # CONFIG_OMFS_FS is not set
 # CONFIG_QNX4FS_FS is not set
 # CONFIG_ROMFS_FS is not set
+# CONFIG_PSTORE is not set
 # CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=y
 CONFIG_NFS_V3=y
@ -2481,6 +2531,7 @@ CONFIG_NLS_UTF8=y
 #
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_PRINTK_TIME=y
+CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
 # CONFIG_ENABLE_WARN_DEPRECATED is not set
 # CONFIG_ENABLE_MUST_CHECK is not set
 CONFIG_FRAME_WARN=1024
@ -2489,10 +2540,10 @@ CONFIG_FRAME_WARN=1024
 # CONFIG_UNUSED_SYMBOLS is not set
 # CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_SECTION_MISMATCH is not set
 # CONFIG_DEBUG_KERNEL is not set
 # CONFIG_HARDLOCKUP_DETECTOR is not set
 # CONFIG_SLUB_STATS is not set
-# CONFIG_BKL is not set
 # CONFIG_SPARSE_RCU_POINTER is not set
 # CONFIG_DEBUG_MEMORY_INIT is not set
 CONFIG_ARCH_WANT_FRAME_POINTERS=y
@ -2517,6 +2568,7 @@ CONFIG_TRACING_SUPPORT=y
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_ARCH_KGDB=y
 CONFIG_HAVE_ARCH_KMEMCHECK=y
+# CONFIG_TEST_KSTRTOX is not set
 CONFIG_STRICT_DEVMEM=y
 # CONFIG_X86_VERBOSE_BOOTUP is not set
 # CONFIG_EARLY_PRINTK is not set
@ -2683,5 +2735,6 @@ CONFIG_XZ_DEC_BCJ=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_DMA=y
+CONFIG_CPU_RMAP=y
 CONFIG_NLATTR=y
 CONFIG_AVERAGE=y
--- a/projects/ION/options
+++ b/projects/ION/options
@ -147,9 +147,6 @@
 # build and install SABnzbd Newsgroup downloader daemon (yes / no)
  SABNZBD="yes"

-# build and install SickBeard Newsgroup downloader daemon (yes / no)
-  SICKBEARD="yes"
-
 # build and install some tools for including in release (yes / no)
 # some of this tools are: htop, nano, wgetpaste
  TOOLS="yes"
--- a/Show More
+++ b/Show More