Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-3.0

packages/linux/patches/linux-3.6.7-205-add_Adaptec_eHome_Infrared_Receiver.patch

@@ -0,0 +1,20 @@
+diff -Naur linux-3.6.7/drivers/media/rc/mceusb.c linux-3.6.7.patch/drivers/media/rc/mceusb.c
+--- linux-3.6.7/drivers/media/rc/mceusb.c	2012-11-29 04:45:51.142129739 +0100
++++ linux-3.6.7.patch/drivers/media/rc/mceusb.c	2012-11-29 04:51:30.982828558 +0100
+@@ -200,6 +200,7 @@
+ #define VENDOR_TIVO		0x105a
+ #define VENDOR_CONEXANT		0x0572
+ #define VENDOR_TWISTEDMELON	0x2596
++#define VENDOR_ADAPTEC		0x03f3
+ 
+ enum mceusb_model_type {
+ 	MCE_GEN2 = 0,		/* Most boards */
+@@ -400,6 +401,8 @@
+ 	{ USB_DEVICE(VENDOR_TWISTEDMELON, 0x8016) },
+ 	/* Twisted Melon Inc. - Manta Transceiver */
+ 	{ USB_DEVICE(VENDOR_TWISTEDMELON, 0x8042) },
++	/* Adaptec / HP eHome Receiver */
++	{ USB_DEVICE(VENDOR_ADAPTEC, 0x0094) },
+ 	/* Terminating entry */
+ 	{ }
+ };

packages/mediacenter/xbmc-addon-xvdr/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc-addon-xvdr"
-PKG_VERSION="10980dc"
+PKG_VERSION="1d8f64c"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/xbmc-theme-Confluence/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc-theme-Confluence"
-PKG_VERSION="0a59a1f"
+PKG_VERSION="8f38d64"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/xbmc/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc"
-PKG_VERSION="0a59a1f"
+PKG_VERSION="8f38d64"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"