Squash of 3.4->3.4.99

In the conflicts, all files from HEAD are kept.

Conflicts:
	arch/arm/Kconfig
	arch/arm/Makefile
	arch/arm/include/asm/mutex.h
	arch/arm/include/asm/uaccess.h
	arch/arm/kernel/perf_event.c
	arch/arm/kernel/traps.c
	arch/arm/mm/dma-mapping.c
	arch/arm/mm/mmu.c
	arch/arm/mm/proc-v7.S
	arch/arm/mm/tlb-v7.S
	arch/arm/vfp/entry.S
	arch/arm/vfp/vfpmodule.c
	drivers/base/power/main.c
	drivers/bluetooth/ath3k.c
	drivers/bluetooth/btusb.c
	drivers/gpio/gpio-msm-v2.c
	drivers/md/dm-crypt.c
	drivers/media/dvb/dvb-core/dmxdev.c
	drivers/mfd/mfd-core.c
	drivers/mmc/card/block.c
	drivers/mmc/core/cd-gpio.c
	drivers/mmc/host/sdhci.c
	drivers/mtd/mtdchar.c
	drivers/net/ethernet/smsc/smc91x.h
	drivers/net/tun.c
	drivers/staging/zram/zram_drv.c
	drivers/staging/zram/zram_sysfs.c
	drivers/staging/zsmalloc/zsmalloc-main.c
	drivers/uio/uio.c
	drivers/usb/core/driver.c
	drivers/usb/core/hub.c
	drivers/usb/core/message.c
	drivers/usb/dwc3/ep0.c
	drivers/usb/dwc3/gadget.c
	drivers/usb/gadget/f_mass_storage.c
	drivers/usb/gadget/u_ether.c
	drivers/usb/host/xhci-hub.c
	drivers/usb/host/xhci-plat.c
	drivers/usb/host/xhci.c
	drivers/usb/host/xhci.h
	drivers/usb/serial/qcserial.c
	drivers/usb/serial/usb_wwan.c
	drivers/video/au1100fb.c
	drivers/video/au1200fb.c
	drivers/virtio/virtio_ring.c
	fs/ecryptfs/mmap.c
	fs/ext4/ext4_jbd2.c
	fs/ext4/ialloc.c
	fs/ext4/xattr.c
	fs/ubifs/dir.c
	include/linux/highmem.h
	include/linux/kref.h
	include/linux/sched.h
	include/linux/virtio.h
	include/net/bluetooth/hci_core.h
	include/net/bluetooth/mgmt.h
	include/sound/core.h
	kernel/cgroup.c
	kernel/events/core.c
	kernel/hrtimer.c
	kernel/panic.c
	kernel/power/suspend.c
	kernel/sched/core.c
	kernel/signal.c
	kernel/sys.c
	kernel/time/timekeeping.c
	kernel/workqueue.c
	mm/internal.h
	mm/memory_hotplug.c
	mm/vmscan.c
	net/bluetooth/hci_conn.c
	net/bluetooth/hci_core.c
	net/bluetooth/hci_event.c
	net/bluetooth/l2cap_core.c
	net/bluetooth/mgmt.c
	net/bluetooth/rfcomm/sock.c
	net/bluetooth/smp.c
	net/core/flow_dissector.c
	net/ipv4/ping.c
	net/wireless/nl80211.c
	net/wireless/reg.c