Linux 3.4.25

Signed-off-by: Harsh Bhanvadia <harsh.slade@gmail.com>

Conflicts:
	drivers/usb/host/ehci-pci.c
	drivers/usb/host/pci-quirks.c
	drivers/usb/host/xhci.c
	sound/usb/midi.c
Linux 3.4.26

Signed-off-by: Harsh Bhanvadia <harsh.slade@gmail.com>

Conflicts:
	drivers/block/rbd.c
	drivers/gpu/drm/i915/intel_lvds.c
	drivers/hid/usbhid/hid-quirks.c
	drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
	drivers/usb/class/cdc-acm.c
	drivers/usb/core/hub.c
	drivers/usb/host/xhci.c
	drivers/usb/serial/option.c
	net/ceph/messenger.c
	net/ceph/osd_client.c
	net/ceph/osdmap.c
Linux 3.4.27

Signed-off-by: Harsh Bhanvadia <harsh.slade@gmail.com>

Conflicts:
	arch/x86/kernel/entry_32.S
	drivers/target/target_core_transport.c
Linux 3.4.28

Signed-off-by: Harsh Bhanvadia <harsh.slade@gmail.com>
mako: faux's Gamma Control

Gamma control interface for Nexus4

Signed-off-by: faux123 <reioux@gmail.com>
mako: Gamma control change checksum

Change checksum and made it counter based to just check if all 10 values are present within our range.

Signed-off-by: Harsh Bhanvadia <harsh.slade@gmail.com>
EHCI: HSIC: disable data payload logging

To enable data payload logging:-

echo 1 > /sys/module/ehci_hcd/parameters/enable_payload_log

Conflicts:
	drivers/usb/host/ehci-msm-hsic.c
Linux 3.4.29

Signed-off-by: Harsh Bhanvadia <harsh.slade@gmail.com>

Conflicts:
	arch/arm/vfp/vfphw.S
	arch/x86/platform/efi/efi.c
Linux 3.4.30

Signed-off-by: Harsh Bhanvadia <harsh.slade@gmail.com>

Conflicts:
	drivers/gpu/drm/radeon/evergreen.c
	drivers/usb/host/pci-quirks.c
	drivers/usb/serial/option.c
Linux 3.4.31

Signed-off-by: Harsh Bhanvadia <harsh.slade@gmail.com>

Conflicts:
	arch/x86/kernel/setup.c
	arch/x86/platform/efi/efi.c
	init/main.c
Linux 3.4.32

Signed-off-by: Harsh Bhanvadia <harsh.slade@gmail.com>
Linux 3.4.33

Signed-off-by: Harsh Bhanvadia <harsh.slade@gmail.com>
Linux 3.4.34

Signed-off-by: Harsh Bhanvadia <harsh.slade@gmail.com>

Conflicts:
	drivers/gpu/drm/radeon/atombios_crtc.c
	drivers/gpu/drm/udl/udl_fb.c
	drivers/usb/serial/option.c
	mm/mmu_notifier.c
	sound/pci/hda/patch_realtek.c
Linux 3.4.35

Signed-off-by: Harsh Bhanvadia <harsh.slade@gmail.com>

Conflicts:
	drivers/hid/hid-core.c
	drivers/hid/hid-ids.h
	drivers/media/rc/rc-main.c
Sound Control: Sound control for WCD93xx codec

Fully GPL'ed version.

Signed-off-by: faux123 <reioux@gmail.com>
wlan: Fix for ARP offload issue

Change is to make sure ARP offload works fine
for active sessions when any one out of multiple
session terminated in suspend mode.
Setting of mc/bc filter without considering
ARP offload parameter during DUT suspend mode
was the issue.

CRs-fixed: 452179
Change-Id: I9bd72a43b5bb02df70d63085638b7e8027fcb076
prima: partialy disable debug
EHCI: HSIC: disable pm runtime device before remove hcd

Merge order of commits 21a480e and e50d914 introduced runtime pm
disable depth counter imbalance fixed by e50d914 again. Fix the
bug by disabling runtime pm before removing HCD.

Change-Id: I249a4f63db3a975652e6ce15545584e41bae284b
Signed-off-by: Ido Shayevitz <idos@codeaurora.org>

Conflicts:
	drivers/usb/host/ehci-msm-hsic.c
mako: Support for Krait Retention

Touch changes.
Added Krait Retention
msm: acpuclock-8064: Cleaned up PVS table for 8064

Make PVS table more clean by removing unused frequency steps.

Conflicts:
	arch/arm/mach-msm/acpuclock-8064.c