Merge 3.18.46 into android-3.18

Changes in 3.18.46:
	scsi: megaraid_sas: fix macro MEGASAS_IS_LOGICAL to avoid regression
	bus: arm-ccn: Provide required event arguments
	bus: arm-ccn: Fix PMU handling of MN
	drm/msm: fix use of copy_from_user() while holding spinlock
	mtd: nand: davinci: Reinitialize the HW ECC engine in 4bit hwctl
	cpuset: handle race between CPU hotplug and cpuset_hotplug_work
	can: dev: fix deadlock reported after bus-off
	mm,ksm: fix endless looping in allocating memory when ksm enable
	ARM: 8617/1: dma: fix dma_max_pfn()
	x86/init: Fix cr4_init_shadow() on CR4-less machines
	scripts/has-stack-protector: add -fno-PIE
	x86/kexec: add -fno-PIE
	tcp: fix use after free in tcp_xmit_retransmit_queue()
	fuse: Propagate dentry down to inode_change_ok()
	nfsd: Disable NFSv2 timestamp workaround for NFSv3+
	scsi: arcmsr: Buffer overflow in arcmsr_iop_message_xfer()
	Bluetooth: Fix potential NULL dereference in RFCOMM bind callback
	packet: fix race condition in packet_set_ring
	Linux 3.18.46

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