Merge tag 'v3.4.60' into update-linux

This is the 3.4.60 stable release

Conflicts:
	arch/arm/Kconfig
	arch/arm/include/asm/mutex.h
	arch/arm/kernel/traps.c
	arch/arm/mm/dma-mapping.c
	drivers/base/power/main.c
	drivers/bluetooth/ath3k.c
	drivers/bluetooth/btusb.c
	drivers/gpu/drm/radeon/radeon_mode.h
	drivers/mmc/card/block.c
	drivers/mmc/host/sdhci.c
	drivers/usb/core/message.c
	drivers/usb/host/xhci.h
	drivers/virtio/virtio_ring.c
	fs/ubifs/dir.c
	include/linux/freezer.h
	include/linux/virtio.h
	include/net/bluetooth/hci_core.h
	include/net/bluetooth/mgmt.h
	kernel/cgroup.c
	kernel/futex.c
	kernel/signal.c
	net/bluetooth/hci_conn.c
	net/bluetooth/hci_core.c
	net/bluetooth/l2cap_core.c
	net/bluetooth/mgmt.c
	net/bluetooth/rfcomm/sock.c
	net/bluetooth/smp.c

Change-Id: I95c78f3a26e29b3e959bc63f6a814346b3e84e9e
leds: leds-pm8xxx: update from evita TMO DE MR1 release

HTC kernel version: evitaul-jb-crc-3.4.10-08ef01e

Change-Id: I89d5ed0f62171e5fa1095cf3223acf787c678886
input: touchscreen: synaptics_3200: reduce delays

* Reduce wait using usleep instead of msleep for critical path delays.
* Use hrtimers for non-critical path delays.

Change-Id: Id5e0687f04dd498a7b938b4ca82f4a1b5162c7a5
input: touchscreen: cy8c_cs: reduce delays

* Reduce wait using usleep instead of msleep for critical path delays.
* Use hrtimers for non-critical path delays.

Change-Id: I3fd662d0b4c234cf86905d3337ae4fb70d2b0417
input: ewtzmu2: reduce delays

* Reduce wait using usleep instead of msleep for critical path delays.
* Use hrtimers for non-critical path delays.

Change-Id: I0374d4c69398a39756b97883ced09a8af9d3c2a4
input: cm3629: reduce delays

* Reduce wait using usleep instead of msleep for critical path delays.
* Use hrtimers for non-critical path delays.

Change-Id: Ice768b237fd08d978cb60332bc47a9d6d8418fe8
msm: HTC: ville: reduce delays

* Reduce wait using usleep instead of msleep for critical path delays.
* Use hrtimers for non-critical path delays.

Change-Id: Iac21a289c5ac81db2b652c66e1a32f2b350da174
msm: HTC: elite: reduce delays

* Reduce wait using usleep instead of msleep for critical path delays.
* Use hrtimers for non-critical path delays.

Change-Id: I42be76a808dd1e6abbb310d7fc071cf3c7e89a40
msm: HTC: jet: reduce delays

* Reduce wait using usleep instead of msleep for critical path delays.
* Use hrtimers for non-critical path delays.

Change-Id: I0c8b237010ac48b05d9e4745d9d84d6e69d7162f
msm: HTC: fighter: reduce delays

* Reduce wait using usleep instead of msleep for critical path delays.
* Use hrtimers for non-critical path delays.

Change-Id: If78edd81cc502ab500f8e56f2a97ac0136b4b75a
usb: gadget: mass_storage: added sysfs entry for cdrom to LUNs

This patch adds a "cdrom" sysfs entry for each mass_storage LUN, just
like "ro" sysfs entry. This allows switching between USB and CD-ROM
emulation without reinserting the module or recompiling the kernel.

Change-Id: Idf83c74815b1ad370428ab9d3e5503d5f7bcd3b6
msm: HTC: 8960: clean up regulator references

Change-Id: I85dfb1a561690404147d317abbf6c505c22755c6
msm: HTC: 8960: clean up panel debugging

* Use pr_err, pr_info
* Due to the way the backlight works, the backlight debugging is very
  noisy, remove it.

Change-Id: I353213a972ba4daf73f8d19af963eeed74db1aac
msm: HTC: 8960: set acpuclk-8960 as regulator consumers

Change-Id: Ia48653a34258a4f240494540ca21849be61b921d
msm: HTC: ville: add missing debug devices, reorganize device list

Change-Id: Ied8fcf79fd5d7e8f28235f8ea2c52a51263ee35e
msm: HTC: fighter: audio board file clean-up

This is all cosmetic while I was looking for any problems in fighter's
audio board file.

1. double entry of pm8921.h
2. tlv not used
3. system_rev = 128
4. no hdmi support
5. whitespace and #if 0 removal

Change-Id: Ifcda73f987f758c4a9843d23e2a3ea22480e7a0e
Merge "usb: gadget: mass_storage: added sysfs entry for cdrom to LUNs" into cm-10.2
Merge tag 'AU_LINUX_ANDROID_JB_2.6.04.03.00.109.053' into cm-10.2

AU_LINUX_ANDROID_JB_2.6.04.03.00.109.053 based on quic/aosp/jb_2.6

Conflicts:
	arch/arm/mach-msm/ipc_router.h
	arch/arm/mach-msm/ipc_socket.c
	drivers/video/msm/hdmi_msm.c

Change-Id: Ic5e2fc57b4a3ecdd5d8c2f48217bffa29d0b3451
Merge tag 'v3.4.62' into cm-10.2

This is the 3.4.62 stable release
Merge "msm: HTC: fighter: audio board file clean-up" into cm-10.2