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

also:
 - update xbmc to xbmc-a296342
 - update XVBA and VDPAU patches

Conflicts:
	packages/linux/meta
	packages/mediacenter/xbmc-addon-xvdr/meta
	packages/mediacenter/xbmc-frodo-theme-Confluence/meta
	packages/mediacenter/xbmc-frodo/meta
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-9777cc0-001-add_support_to_specify_GIT_REV-0.1.patch
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-9777cc0-303-fix_libdvd_xFLAGS-0.1.patch
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-9777cc0-311-fix_rsxs_build-0.1.patch
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-9777cc0-321-texturepacker-hostflags-and-rework.patch
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-9777cc0-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-9777cc0-452-change_lcd_content-0.1.patch
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-9777cc0-453-add_openelec.tv_RSS_news-0.1.patch
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-9777cc0-454-disable_backslash-0.1.patch
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-9777cc0-457-fix_connection_check-0.1.patch
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-9777cc0-463-add_remote_devinput-0.1.patch
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f13566b-001-add_support_to_specify_GIT_REV-0.1.patch
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f13566b-303-fix_libdvd_xFLAGS-0.1.patch
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f13566b-311-fix_rsxs_build-0.1.patch
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f13566b-321-texturepacker-hostflags-and-rework.patch
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f13566b-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f13566b-452-change_lcd_content-0.1.patch
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f13566b-453-add_openelec.tv_RSS_news-0.1.patch
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f13566b-454-disable_backslash-0.1.patch
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f13566b-457-fix_connection_check-0.1.patch
	packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-f13566b-463-add_remote_devinput-0.1.patch
	packages/mediacenter/xbmc-theme-Confluence/meta
	packages/mediacenter/xbmc-theme-Confluence/patches/xbmc-theme-Confluence-11.0.3-001-add_oe_settings_to_homescreen.patch
	packages/mediacenter/xbmc/meta
	packages/mediacenter/xbmc/patches/xbmc-11.0.2-902.01-xvba_support_vdpau_rework-c633159.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-001-add_support_to_specify_GIT_REV-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-303-fix_libdvd_xFLAGS-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-311-fix_rsxs_build-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-321-texturepacker-hostflags-and-rework.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-331-fix_playpause_problem_ticket_7338-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-402-enable_yasm_in_ffmpeg-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-404-add_lame_check-0.6.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-452-change_lcd_content-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-453-add_openelec.tv_RSS_news-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-454-disable_backslash-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-457-fix_connection_check-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-463-add_remote_devinput-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-806.01-cdrip-PR616.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-806.02-cdrip-PR718.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-901.01-ffmpeg-10.2-28b186f.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-901.03-ffmpeg_crystalhd_implementation.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-901.41-avfilter-depends-on-avformat.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-902.00-vdpau_reset_pvr_changes.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-902.01-xvba_support_vdpau_rework-c633159.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-902.02-xvba_support-gcc-4.7.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-902.03-fix_configure_in_VDPAU_detect.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-902.11-disable_interop.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-902.12-linuxrenderer_delete_texture_targets_on_reconfigure.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-902.21-backport_vdpau_and_xvba_patches-b38863d.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-903.01-fixed_still_frames_at_the_start_of_a_VTS_in_dvd_could_end_up_not_showing.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-981-toggleButtonState.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-982-UDisk-device-must-be-remount-in-DeviceChanged-event.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-983-fixed-failure-to-broswe-for-smb-shares.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-984-do-not-remount-non-optical-devices-in-DeviceChanged-event.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-990-wiimote.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-999-crosscompile.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-999.002-268d6a0-fix_ASIC_hang.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-999.003-rar-PR1147.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-999.011-airtunes_reapply_lost_fix.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-999.012-airtunes_implementation_for_windows_using_libshairplay.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-999.013-airtunes-add_dmap_metadata_parsing.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-999.021-libnfs-1.3_support.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-999.055-search-dialogs-workaround.patch
	packages/mediacenter/xbmc/patches/xbmc-11.0.3-999.056-remove-broken-scrapers.patch
	packages/mediacenter/xbmc/patches/xbmc-f13566b-001-add_support_to_specify_GIT_REV-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-f13566b-303-fix_libdvd_xFLAGS-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-f13566b-311-fix_rsxs_build-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-f13566b-321-texturepacker-hostflags-and-rework.patch
	packages/mediacenter/xbmc/patches/xbmc-f13566b-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-f13566b-452-change_lcd_content-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-f13566b-453-add_openelec.tv_RSS_news-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-f13566b-454-disable_backslash-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-f13566b-457-fix_connection_check-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-f13566b-463-add_remote_devinput-0.1.patch
	packages/mediacenter/xbmc/patches/xbmc-f13566b-801-xvba_support-d7b836a.patch
	tools/mkpkg/mkpkg_xbmc-eden

packages/devel/libcec/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="libcec"
-PKG_VERSION="1.9.0"
+PKG_VERSION="2.0.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/linux/meta

@@ -21,7 +21,7 @@
 PKG_NAME="linux"
 PKG_VERSION="3.6.1"
 if [ "$LINUX" = "3.2" ]; then
-  PKG_VERSION="3.2.30"
+  PKG_VERSION="3.2.31"
 fi
 PKG_REV="1"
 PKG_ARCH="any"

packages/linux/patches/linux-3.2.31-055-RC_Fix_invalid-free_region-and-or-free_irq-on-probe-failure.patch

@@ -0,0 +1,149 @@
+From f27b853ea24a9b70585f9251384d97929e6551c3 Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben@decadent.org.uk>
+Date: Mon, 14 May 2012 21:36:00 -0300
+Subject: [PATCH] [media] rc: Fix invalid free_region and/or free_irq on probe
+ failure
+
+fintek-cir, ite-cir and nuvoton-cir may try to free an I/O region
+and/or IRQ handler that was never allocated after a failure in their
+respective probe functions.  Add and use separate labels on the
+failure path so they will do the right cleanup after each possible
+point of failure.
+
+Compile-tested only.
+
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
+---
+ drivers/media/rc/fintek-cir.c  |   13 ++++++-------
+ drivers/media/rc/ite-cir.c     |   14 ++++++--------
+ drivers/media/rc/nuvoton-cir.c |   26 ++++++++++++--------------
+ 3 files changed, 24 insertions(+), 29 deletions(-)
+
+diff --git a/drivers/media/rc/fintek-cir.c b/drivers/media/rc/fintek-cir.c
+index 4a3a238..6aabf7a 100644
+--- a/drivers/media/rc/fintek-cir.c
++++ b/drivers/media/rc/fintek-cir.c
+@@ -556,11 +556,11 @@ static int fintek_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id
+ 
+ 	if (request_irq(fintek->cir_irq, fintek_cir_isr, IRQF_SHARED,
+ 			FINTEK_DRIVER_NAME, (void *)fintek))
+-		goto failure;
++		goto failure2;
+ 
+ 	ret = rc_register_device(rdev);
+ 	if (ret)
+-		goto failure;
++		goto failure3;
+ 
+ 	device_init_wakeup(&pdev->dev, true);
+ 	fintek->rdev = rdev;
+@@ -570,12 +570,11 @@ static int fintek_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id
+ 
+ 	return 0;
+ 
++failure3:
++	free_irq(fintek->cir_irq, fintek);
++failure2:
++	release_region(fintek->cir_addr, fintek->cir_port_len);
+ failure:
+-	if (fintek->cir_irq)
+-		free_irq(fintek->cir_irq, fintek);
+-	if (fintek->cir_addr)
+-		release_region(fintek->cir_addr, fintek->cir_port_len);
+-
+ 	rc_free_device(rdev);
+ 	kfree(fintek);
+ 
+diff --git a/drivers/media/rc/ite-cir.c b/drivers/media/rc/ite-cir.c
+index 0e49c99..36fe5a3 100644
+--- a/drivers/media/rc/ite-cir.c
++++ b/drivers/media/rc/ite-cir.c
+@@ -1598,24 +1598,22 @@ static int ite_probe(struct pnp_dev *pdev, const struct pnp_device_id
+ 
+ 	if (request_irq(itdev->cir_irq, ite_cir_isr, IRQF_SHARED,
+ 			ITE_DRIVER_NAME, (void *)itdev))
+-		goto failure;
++		goto failure2;
+ 
+ 	ret = rc_register_device(rdev);
+ 	if (ret)
+-		goto failure;
++		goto failure3;
+ 
+ 	itdev->rdev = rdev;
+ 	ite_pr(KERN_NOTICE, "driver has been successfully loaded\n");
+ 
+ 	return 0;
+ 
++failure3:
++	free_irq(itdev->cir_irq, itdev);
++failure2:
++	release_region(itdev->cir_addr, itdev->params.io_region_size);
+ failure:
+-	if (itdev->cir_irq)
+-		free_irq(itdev->cir_irq, itdev);
+-
+-	if (itdev->cir_addr)
+-		release_region(itdev->cir_addr, itdev->params.io_region_size);
+-
+ 	rc_free_device(rdev);
+ 	kfree(itdev);
+ 
+diff --git a/drivers/media/rc/nuvoton-cir.c b/drivers/media/rc/nuvoton-cir.c
+index 8b2c071..dc8a7dd 100644
+--- a/drivers/media/rc/nuvoton-cir.c
++++ b/drivers/media/rc/nuvoton-cir.c
+@@ -1075,19 +1075,19 @@ static int nvt_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id)
+ 
+ 	if (request_irq(nvt->cir_irq, nvt_cir_isr, IRQF_SHARED,
+ 			NVT_DRIVER_NAME, (void *)nvt))
+-		goto failure;
++		goto failure2;
+ 
+ 	if (!request_region(nvt->cir_wake_addr,
+ 			    CIR_IOREG_LENGTH, NVT_DRIVER_NAME))
+-		goto failure;
++		goto failure3;
+ 
+ 	if (request_irq(nvt->cir_wake_irq, nvt_cir_wake_isr, IRQF_SHARED,
+ 			NVT_DRIVER_NAME, (void *)nvt))
+-		goto failure;
++		goto failure4;
+ 
+ 	ret = rc_register_device(rdev);
+ 	if (ret)
+-		goto failure;
++		goto failure5;
+ 
+ 	device_init_wakeup(&pdev->dev, true);
+ 	nvt->rdev = rdev;
+@@ -1099,17 +1099,15 @@ static int nvt_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id)
+ 
+ 	return 0;
+ 
++failure5:
++	free_irq(nvt->cir_wake_irq, nvt);
++failure4:
++	release_region(nvt->cir_wake_addr, CIR_IOREG_LENGTH);
++failure3:
++	free_irq(nvt->cir_irq, nvt);
++failure2:
++	release_region(nvt->cir_addr, CIR_IOREG_LENGTH);
+ failure:
+-	if (nvt->cir_irq)
+-		free_irq(nvt->cir_irq, nvt);
+-	if (nvt->cir_addr)
+-		release_region(nvt->cir_addr, CIR_IOREG_LENGTH);
+-
+-	if (nvt->cir_wake_irq)
+-		free_irq(nvt->cir_wake_irq, nvt);
+-	if (nvt->cir_wake_addr)
+-		release_region(nvt->cir_wake_addr, CIR_IOREG_LENGTH);
+-
+ 	rc_free_device(rdev);
+ 	kfree(nvt);
+ 
+-- 
+1.7.7.6
+