rtime.felk.cvut.cz Git - sojka/nv-tegra/linux-3.10.git/commit

]> rtime.felk.cvut.cz Git - sojka/nv-tegra/linux-3.10.git/commit

projects / sojka / nv-tegra / linux-3.10.git / commit

author	Bharat Nihalani <bnihalani@nvidia.com>
	Mon, 12 May 2014 08:11:27 +0000 (13:41 +0530)
committer	Bharat Nihalani <bnihalani@nvidia.com>
	Mon, 12 May 2014 08:11:27 +0000 (13:41 +0530)
commit	04993371ce32f62e07dc9f481d98711711027279
tree	4041d0b47430856d52215e3c429666dd41c0db06	tree \| snapshot
parent	4ef4838bd6f2a5fc065acfd0932099b1c2f6fa85	commit \| diff
parent	7d5e9ecd697d6a32909aa574a9d704e5d361822c	commit \| diff

Merge ARM64 changes from 3.11 to 3.14-rc5

Bug 1494135

Conflicts:
arch/arm/include/asm/arch_timer.h
arch/arm64/Kconfig
arch/arm64/configs/defconfig
arch/arm64/include/asm/hwcap.h
arch/arm64/include/uapi/asm/hwcap.h
arch/arm64/kernel/Makefile
arch/arm64/kernel/head.S
arch/arm64/kernel/setup.c
arch/arm64/kernel/vmlinux.lds.S

Change-Id: I3cf03322c81ed532514ae196823dc418c3e22542
Signed-off-by: Ishan Mittal <imittal@nvidia.com>
Signed-off-by: Bharat Nihalani <bnihalani@nvidia.com>

23 files changed:

arch/arm/include/asm/arch_timer.h	diff1 \|	diff2 \|	blob \| history
arch/arm64/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm64/configs/defconfig	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/compat.h	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/cputype.h	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/hwcap.h	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/pgtable.h	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/processor.h	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/ptrace.h	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/uaccess.h	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/head.S	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/perf_event.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/process.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/smp.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/smp_spin_table.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/suspend.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/vmlinux.lds.S	diff1 \|	diff2 \|	blob \| history
arch/arm64/mm/cache.S	diff1 \|	diff2 \|	blob \| history
arch/arm64/mm/fault.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/mm/init.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/mm/proc.S	diff1 \|	diff2 \|	blob \| history

RSS Atom

arch/arm/include/asm/arch_timer.h	diff1 \|	diff2 \|	blob \| history
arch/arm64/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm64/configs/defconfig	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/compat.h	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/cputype.h	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/hwcap.h	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/pgtable.h	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/processor.h	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/ptrace.h	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/uaccess.h	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/head.S	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/perf_event.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/process.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/smp.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/smp_spin_table.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/suspend.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/vmlinux.lds.S	diff1 \|	diff2 \|	blob \| history
arch/arm64/mm/cache.S	diff1 \|	diff2 \|	blob \| history
arch/arm64/mm/fault.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/mm/init.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/mm/proc.S	diff1 \|	diff2 \|	blob \| history