Merge tag 'v3.13' into h8300

Merge tag 'v3.13' into h8300

Linux 3.13

Conflicts:
	arch/h8300/Kconfig
	arch/h8300/Kconfig.cpu
	arch/h8300/Kconfig.debug
	arch/h8300/Makefile
	arch/h8300/boards/ae3069/Makefile
	arch/h8300/boards/ae3069/crt0_ram.S
	arch/h8300/boards/edosk2674/Makefile
	arch/h8300/boards/edosk2674/crt0_ram.S
	arch/h8300/boards/edosk2674/crt0_rom.S
	arch/h8300/boards/h8300h_sim/Makefile
	arch/h8300/boards/h8300h_sim/crt0_ram.S
	arch/h8300/boards/h8300h_sim/crt0_rom.S
	arch/h8300/boards/h8max/Makefile
	arch/h8300/boards/h8max/crt0_ram.S
	arch/h8300/include/asm/barrier.h
	arch/h8300/include/asm/bugs.h
	arch/h8300/include/asm/cacheflush.h
	arch/h8300/include/asm/current.h
	arch/h8300/include/asm/dma.h
	arch/h8300/include/asm/io.h
	arch/h8300/include/asm/irq.h
	arch/h8300/include/asm/irqflags.h
	arch/h8300/include/asm/mmu_context.h
	arch/h8300/include/asm/page.h
	arch/h8300/include/asm/param.h
	arch/h8300/include/asm/pgalloc.h
	arch/h8300/include/asm/pgtable.h
	arch/h8300/include/asm/processor.h
	arch/h8300/include/asm/scatterlist.h
	arch/h8300/include/asm/shmparam.h
	arch/h8300/include/asm/switch_to.h
	arch/h8300/include/asm/termios.h
	arch/h8300/include/asm/timer.h
	arch/h8300/include/asm/tlbflush.h
	arch/h8300/include/asm/traps.h
	arch/h8300/include/asm/types.h
	arch/h8300/include/asm/uaccess.h
	arch/h8300/include/asm/ucontext.h
	arch/h8300/include/asm/unistd.h
	arch/h8300/include/uapi/asm/ioctls.h
	arch/h8300/include/uapi/asm/msgbuf.h
	arch/h8300/include/uapi/asm/posix_types.h
	arch/h8300/include/uapi/asm/sembuf.h
	arch/h8300/include/uapi/asm/shmbuf.h
	arch/h8300/include/uapi/asm/socket.h
	arch/h8300/include/uapi/asm/sockios.h
	arch/h8300/include/uapi/asm/stat.h
	arch/h8300/include/uapi/asm/swab.h
	arch/h8300/include/uapi/asm/termbits.h
	arch/h8300/kernel/Makefile
	arch/h8300/kernel/asm-offsets.c
	arch/h8300/kernel/entry.S
	arch/h8300/kernel/irq.c
	arch/h8300/kernel/process.c
	arch/h8300/kernel/ptrace.c
	arch/h8300/kernel/ptrace_h.c
	arch/h8300/kernel/ptrace_s.c
	arch/h8300/kernel/setup.c
	arch/h8300/kernel/sys_h8300.c
	arch/h8300/kernel/syscalls.S
	arch/h8300/kernel/time.c
	arch/h8300/kernel/timer/Makefile
	arch/h8300/kernel/timer/timer16.c
	arch/h8300/kernel/timer/timer8.c
	arch/h8300/kernel/timer/tpu.c
	arch/h8300/kernel/vmlinux.lds.S
	arch/h8300/lib/memcpy.S
	arch/h8300/lib/memset.S
	arch/h8300/mm/fault.c
	drivers/tty/serial/Kconfig