HID: Pull current UHID driver from caf-msm/msm-3.4
crpalmer_defconfig: enable UHID for Bluedroid
Version 2.0.27-cm1
msm_serial_hs: bulk update from CodeAurora

CodeAurora tag: AU_LINUX_ANDROID_JB_2.5.04.02.02.040.282

Change-Id: I75d3133f7eb541640dd58279e018c3932253290c

Conflicts:
	arch/arm/mach-msm/board-monarudo.c
	drivers/tty/serial/msm_serial_hs.c
Version 2.0.27-cm2
btrfs: don't stop searching after encountering the wrong item

commit 03b71c6ca6286625d8f1ed44aabab9b5bf5dac10 upstream.

The search ioctl skips items that are too large for a result buffer, but
inline items of a certain size occuring before any search result is
found would trigger an overflow and stop the search entirely.

Bug: https://bugzilla.kernel.org/show_bug.cgi?id=57641

Signed-off-by: Gabriel de Perthuis <g2p.code+btrfs@gmail.com>
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
hwmon: fix error return code in abituguru_probe()

commit ecacb0b17c08fae89f65468727f0e4b8e91da4e1 upstream.

Fix to return a negative error code from the error handling
case instead of 0, as done elsewhere in this function.

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
i2c: designware: always clear interrupts before enabling them

commit 2a2d95e9d6d29e726cc294b65391917ed2e32bf4 upstream.

If the I2C bus is put to a low power state by an ACPI method it might pull
the SDA line low (as its power is removed). Once the bus is put to full
power state again, the SDA line is pulled back to high. This transition
looks like a STOP condition from the controller point-of-view which sets
STOP detected bit in its status register causing the driver to fail
subsequent transfers.

Fix this by always clearing all interrupts before we start a transfer.

Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drm/radeon: Fix VRAM size calculation for VRAM >= 4GB

commit fc986034540102cd090237bf3f70262e1ae80d9c upstream.

Add ULL prefix to avoid overflow.

Signed-off-by: Niels Ole Salscheider <niels_ole@salscheider-online.de>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
media: mantis: fix silly crash case

commit e1d45ae10aea8e8a403e5d96bf5902ee670007ff upstream.

If we set mantis->fe to NULL on an error its not a good idea to then try
passing NULL to the unregister paths and oopsing really.

Resolves-bug: https://bugzilla.kernel.org/show_bug.cgi?id=16473

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Cc: Bjørn Mork <bjorn@mork.no>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Linux 3.4.47
init.d: allow the governor to be set
Merge tag 'v3.4.47' into stock+upstream

This is the 3.4.47 stable release
Merge branch 'stock+upstream' into 2.0.x-cm
Use ccache
Version 2.0.27-cm3
msm_serial_hs: bulk update from CodeAurora

CodeAurora tag: AU_LINUX_ANDROID_JB_2.5.04.02.02.040.282

Change-Id: I75d3133f7eb541640dd58279e018c3932253290c

Conflicts:
	arch/arm/mach-msm/board-monarudo.c
	drivers/tty/serial/msm_serial_hs.c
HID: Pull current UHID driver from caf-msm/msm-3.4
dlx_defconfig: enable UHID driver
bcmdhd: Update to 1.88.16

Applied via patch this commit from the M7 kernel:

commit 976345c4ace203573dda0fbf700899b1235e1246
Author: Ethan Chen <intervigil@gmail.com>
Date:   Sun May 12 16:58:35 2013 -0700

    net: wireless bcmdhd: Update to version 1.88.16

    Code imported from google/android-3.4

    Change-Id: I81220d179e70c5c2724075928ffc8f635742fe17