Merge branch 'odroid-3.4.y' of https://github.com/hardkernel/linux into odroid-3.4.y

Conflicts:
	arch/arm/Kconfig
	arch/arm/kernel/smp.c
	arch/arm/plat-samsung/adc.c
	arch/arm/vfp/entry.S
	drivers/base/power/main.c
	drivers/base/regmap/regmap-debugfs.c
	drivers/dma/pl330.c
	drivers/mfd/mfd-core.c
	drivers/mmc/card/block.c
	drivers/net/tun.c
	drivers/staging/zsmalloc/zsmalloc-main.c
	drivers/usb/core/hub.c
	drivers/usb/host/xhci-ring.c
	drivers/usb/host/xhci.c
	fs/ecryptfs/file.c
	fs/ecryptfs/inode.c
	fs/ecryptfs/mmap.c
	fs/ext4/ialloc.c
	fs/jbd2/commit.c
	fs/jbd2/transaction.c
	kernel/cgroup.c
	kernel/power/suspend.c
	kernel/sched/core.c
	sound/soc/samsung/dma.c