Merge 3.18.60 into android-3.18

Changes in 3.18.60
	xhci: fix deadlock at host remove by running watchdog correctly
	ipv6: release dst on error in ip6_dst_lookup_tail
	netfilter: xt_TCPMSS: add more sanity tests on tcph->doff
	netfilter: synproxy: fix conntrackd interaction
	net: don't call strlen on non-terminated string in dev_set_alias()
	decnet: dn_rtmsg: Improve input length sanitization in dnrmg_receive_user_skb
	Fix an intermittent pr_emerg warning about lo becoming free.
	net: caif: Fix a sleep-in-atomic bug in cfpkt_create_pfx
	igmp: acquire pmc lock for ip_mc_clear_src()
	igmp: add a missing spin_lock_init()
	ipv6: fix calling in6_ifa_hold incorrectly for dad work
	decnet: always not take dst->__refcnt when inserting dst into hash table
	net: 8021q: Fix one possible panic caused by BUG_ON in free_netdev
	arm64: cpuinfo: Missing NULL terminator in compat_hwcap_str
	MIPS: Avoid accidental raw backtrace
	MIPS: pm-cps: Drop manual cache-line alignment of ready_count
	MIPS: Fix IRQ tracing & lockdep when rescheduling
	ALSA: hda - set input_path bitmap to zero after moving it to new place
	drm/vmwgfx: Free hash table allocated by cmdbuf managed res mgr
	usb: gadget: f_fs: Fix possibe deadlock
	sysctl: enable strict writes
	mm: numa: avoid waiting on freed migrated pages
	ARM: dts: BCM5301X: Correct GIC_PPI interrupt flags
	net: korina: Fix NAPI versus resources freeing
	mtd: bcm47xxpart: limit scanned flash area on BCM47XX (MIPS) only
	xfrm: fix stack access out of bounds with CONFIG_XFRM_SUB_POLICY
	xfrm: NULL dereference on allocation failure
	xfrm: Oops on error in pfkey_msg2xfrm_state()
	watchdog: bcm281xx: Fix use of uninitialized spinlock.
	ARM: 8685/1: ensure memblock-limit is pmd-aligned
	iommu/vt-d: Don't over-free page table directories
	iommu/amd: Fix incorrect error handling in amd_iommu_bind_pasid()
	cpufreq: s3c2416: double free on driver init error path
	KVM: x86: zero base3 of unusable segments
	KVM: nVMX: Fix exception injection
	Linux 3.18.60

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