Merge 3.18.34 into android-3.18

Changes in 3.18.34:
	Revert "usb: hub: do not clear BOS field during reset device"
	timers: Use proper base migration in add_timer_on()
	ASoC: rt5640: Correct the digital interface data select
	regulator: s2mps11: Fix invalid selector mask and voltages for buck9
	libahci: save port map for forced port map
	ata: ahci-platform: Add ports-implemented DT bindings.
	regmap: spmi: Fix regmap_spmi_ext_read in multi-byte case
	iio: ak8975: Fix NULL pointer exception on early interrupt
	efi: Fix out-of-bounds read in variable_matches()
	USB: serial: cp210x: add ID for Link ECU
	USB: serial: cp210x: add Straizona Focusers device ids
	[media] v4l2-dv-timings.h: fix polarity for 4k formats
	MD: make bio mergeable
	ALSA: hda - Add dock support for ThinkPad X260
	workqueue: fix ghost PENDING flag while doing MQ IO
	drm/dp/mst: Get validated port ref in drm_dp_update_payload_part1()
	drm/dp/mst: Restore primary hub guid on resume
	cxl: Keep IRQ mappings on context teardown
	drm/i915: Read out the power sequencer port assignment on resume on vlv/chv
	drm/i915/ddi: Fix eDP VDD handling during booting and suspend/resume
	ARM: SoCFPGA: Fix secondary CPU startup in thumb2 kernel
	IB/security: Restrict use of the write() interface
	mm/huge_memory: replace VM_NO_THP VM_BUG_ON with actual VMA check
	ALSA: usb-audio: Quirk for yet another Phoenix Audio devices (v2)
	EDAC: i7core, sb_edac: Don't return NOTIFY_BAD from mce_decoder callback
	atomic_open(): fix the handling of create_error
	Drivers: hv: ring_buffer.c: fix comment style
	Drivers: hv_vmbus: Fix signal to host condition
	Drivers: hv: vmbus: Fix signaling logic in hv_need_to_signal_on_read()
	powerpc: Fix bad inline asm constraint in create_zero_mask()
	Minimal fix-up of bad hashing behavior of hash_64()
	tracing: Don't display trigger file for events that can't be enabled
	drm/radeon: make sure vertical front porch is at least 1
	MAINTAINERS: Remove asterisk from EFI directory names
	ACPICA: Dispatcher: Update thread ID for recursive method calls
	crypto: hash - Fix page length clamping in hash walk
	x86/sysfb_efi: Fix valid BAR address range check
	fs/pnode.c: treat zero mnt_group_id-s as unequal
	propogate_mnt: Handle the first propogated copy being a slave
	mm, cma: prevent nr_isolated_* counters from going negative
	x86/tsc: Read all ratio bits from MSR_PLATFORM_INFO
	parisc: Fix ptrace syscall number and return value modification
	parisc: fix a bug when syscall number of tracee is __NR_Linux_syscalls
	get_rock_ridge_filename(): handle malformed NM entries
	ALSA: hda - Fix bass pin fixup for ASUS N550JX
	ALSA: hda - Apply fix for white noise on Asus N550JV, too
	ALSA: hda - Fix white noise on Asus UX501VW headset
	Input: max8997-haptic - fix NULL pointer dereference
	drm/i915: Bail out of pipe config compute loop on LPT
	ALSA: hda - Asus N750JV external subwoofer fixup
	ALSA: hda - Fix white noise on Asus N750JV headphone
	ALSA: hda - Fix subwoofer pin on ASUS N751 and N551
	ALSA: usb-audio: Yet another Phoneix Audio device quirk
	tools lib traceevent: Free filter tokens in process_filter()
	tools lib traceevent: Do not reassign parg after collapse_tree()
	workqueue: fix rebind bound workers warning
	ocfs2: fix SGID not inherited issue
	ocfs2: dereferencing freed pointers in ocfs2_reflink()
	ocfs2: revert using ocfs2_acl_chmod to avoid inode cluster lock hang
	ocfs2: fix posix_acl_create deadlock
	nf_conntrack: avoid kernel pointer value leak in slab name
	Linux 3.18.34

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>