Linux patch from 3.4.67 to 3.5.0. I have to fix some files!

Conflicts:
	.gitignore
	Documentation/devicetree/bindings/arm/arch_timer.txt
	arch/arm/Kconfig
	arch/arm/boot/compressed/head.S
	arch/arm/include/asm/arch_timer.h
	arch/arm/include/asm/dma-mapping.h
	arch/arm/include/asm/domain.h
	arch/arm/include/asm/io.h
	arch/arm/include/asm/mach/map.h
	arch/arm/kernel/arch_timer.c
	arch/arm/kernel/setup.c
	arch/arm/kernel/vmlinux.lds.S
	arch/arm/mach-msm/board-msm8960.c
	arch/arm/mach-msm/board-msm8x60.c
	arch/arm/mach-msm/include/mach/debug-macro.S
	arch/arm/mach-msm/smd_debug.c
	arch/arm/mach-omap2/omap_hwmod_44xx_data.c
	arch/arm/mm/context.c
	arch/arm/mm/dma-mapping.c
	arch/arm/mm/init.c
	arch/arm/mm/mm.h
	arch/arm/mm/mmu.c
	arch/arm/mm/proc-v7-2level.S
	arch/arm/mm/tlb-v7.S
	arch/arm/tools/mach-types
	arch/arm/vfp/vfpmodule.c
	arch/hexagon/kernel/init_task.c
	arch/x86/include/asm/dma-mapping.h
	arch/x86/kernel/pci-dma.c
	arch/x86/kernel/process.c
	block/elevator.c
	drivers/Kconfig
	drivers/Makefile
	drivers/base/Kconfig
	drivers/base/dma-buf.c
	drivers/base/power/main.c
	drivers/bluetooth/ath3k.c
	drivers/bluetooth/btusb.c
	drivers/bluetooth/hci_ldisc.c
	drivers/char/hw_random/Kconfig
	drivers/char/hw_random/Makefile
	drivers/gpio/Kconfig
	drivers/gpio/Makefile
	drivers/gpu/drm/radeon/radeon_mode.h
	drivers/hid/Kconfig
	drivers/hid/hid-input.c
	drivers/hid/hid-logitech-dj.c
	drivers/input/Makefile
	drivers/input/keyboard/matrix_keypad.c
	drivers/input/misc/mpu3050.c
	drivers/input/touchscreen/atmel_mxt_ts.c
	drivers/leds/Kconfig
	drivers/leds/Makefile
	drivers/media/dvb/dvb-core/dvb_demux.c
	drivers/media/dvb/dvb-core/dvb_demux.h
	drivers/media/video/v4l2-ctrls.c
	drivers/media/video/videobuf-core.c
	drivers/mfd/max77693-irq.c
	drivers/mfd/max77693.c
	drivers/misc/Kconfig
	drivers/misc/Makefile
	drivers/mmc/card/block.c
	drivers/mmc/card/queue.c
	drivers/mmc/core/bus.c
	drivers/mmc/core/core.c
	drivers/mmc/core/mmc.c
	drivers/mmc/core/sdio.c
	drivers/mmc/host/sdhci.c
	drivers/mtd/mtdpart.c
	drivers/mtd/nand/Kconfig
	drivers/net/ethernet/broadcom/tg3.c
	drivers/net/tun.c
	drivers/net/usb/usbnet.c
	drivers/regulator/core.c
	drivers/rtc/Kconfig
	drivers/rtc/alarm.c
	drivers/staging/android/Kconfig
	drivers/staging/android/Makefile
	drivers/staging/android/alarm-dev.c
	drivers/staging/android/logger.c
	drivers/staging/android/persistent_ram.h
	drivers/staging/android/ram_console.c
	drivers/staging/zsmalloc/zsmalloc-main.c
	drivers/usb/Kconfig
	drivers/usb/chipidea/ci13xxx_msm.c
	drivers/usb/core/hub.c
	drivers/usb/core/message.c
	drivers/usb/dwc3/Kconfig
	drivers/usb/dwc3/core.h
	drivers/usb/dwc3/dwc3-omap.c
	drivers/usb/dwc3/gadget.h
	drivers/usb/dwc3/host.c
	drivers/usb/dwc3/io.h
	drivers/usb/gadget/Kconfig
	drivers/usb/gadget/Makefile
	drivers/usb/gadget/ci13xxx_udc.c
	drivers/usb/gadget/ci13xxx_udc.h
	drivers/usb/gadget/composite.c
	drivers/usb/gadget/gadget_chips.h
	drivers/usb/gadget/tcm_usb_gadget.c
	drivers/usb/gadget/u_ether.h
	drivers/usb/gadget/u_serial.c
	drivers/usb/host/xhci-plat.c
	drivers/usb/host/xhci.h
	drivers/usb/serial/Kconfig
	drivers/usb/serial/qcserial.c
	drivers/usb/serial/usb_wwan.c
	drivers/virtio/virtio_ring.c
	fs/ecryptfs/file.c
	fs/ecryptfs/inode.c
	fs/ecryptfs/mmap.c
	fs/ext4/ext4.h
	fs/ext4/namei.c
	fs/jbd2/journal.c
	fs/jbd2/transaction.c
	fs/pstore/ram_core.c
	include/asm-generic/dma-contiguous.h
	include/linux/clk.h
	include/linux/dma-buf.h
	include/linux/mfd/max77693-private.h
	include/linux/mm.h
	include/linux/mmzone.h
	include/linux/persistent_ram.h
	include/linux/power_supply.h
	include/linux/pstore_ram.h
	include/linux/tcp.h
	include/linux/usb/composite.h
	include/linux/usb/hcd.h
	include/linux/videodev2.h
	include/linux/virtio.h
	include/net/bluetooth/bluetooth.h
	include/net/bluetooth/hci.h
	include/net/bluetooth/hci_core.h
	include/net/bluetooth/l2cap.h
	include/net/bluetooth/mgmt.h
	include/net/cfg80211.h
	include/sound/soc-dapm.h
	include/sound/soc-dpcm.h
	include/sound/soc.h
	kernel/cgroup.c
	kernel/irq/chip.c
	kernel/irq/pm.c
	kernel/panic.c
	kernel/power/Makefile
	kernel/power/main.c
	kernel/power/power.h
	kernel/power/suspend.c
	kernel/power/wakelock.c
	kernel/printk.c
	kernel/sched/fair.c
	kernel/timer.c
	kernel/trace/trace.c
	kernel/workqueue.c
	lib/spinlock_debug.c
	mm/compaction.c
	mm/internal.h
	mm/memblock.c
	mm/page_alloc.c
	mm/vmscan.c
	net/bluetooth/af_bluetooth.c
	net/bluetooth/bnep/core.c
	net/bluetooth/hci_conn.c
	net/bluetooth/hci_core.c
	net/bluetooth/hci_event.c
	net/bluetooth/hci_sysfs.c
	net/bluetooth/l2cap_core.c
	net/bluetooth/l2cap_sock.c
	net/bluetooth/mgmt.c
	net/bluetooth/rfcomm/sock.c
	net/bluetooth/rfcomm/tty.c
	net/bluetooth/sco.c
	net/bluetooth/smp.c
	net/ipv4/netfilter/Makefile
	net/ipv6/addrconf.c
	net/ipv6/netfilter/ip6_tables.c
	net/netfilter/xt_socket.c
	net/wireless/core.h
	net/wireless/scan.c
	scripts/.gitignore
	scripts/kconfig/conf.c
	security/selinux/hooks.c
	sound/soc/codecs/Makefile
	sound/soc/soc-core.c
	sound/soc/soc-dapm.c
	sound/soc/soc-pcm.c
	tools/perf/util/parse-events.c
	tools/perf/util/parse-events.h
	tools/perf/util/trace-event-parse.c