git.karo-electronics.de Git - karo-tx-linux.git/commit

]> git.karo-electronics.de Git - karo-tx-linux.git/commit

author	Thierry Reding <treding@nvidia.com>
	Fri, 25 Oct 2013 09:42:33 +0000 (11:42 +0200)
committer	Thierry Reding <treding@nvidia.com>
	Fri, 25 Oct 2013 09:42:33 +0000 (11:42 +0200)
commit	bebf7c88515a5eecac19780b1b93fbf651cc3f1e
tree	a452ce671d2c18521890548e3e5aba86629d2bb4	tree \| snapshot
parent	8d74d6c02976bc0bae6f7a5f6524289e1b7f7383	commit \| diff
parent	56aa4fbf215af23efeee0d5702145960f37bbafc	commit \| diff

Merge remote-tracking branch 'tip/auto-latest'

Conflicts:
arch/h8300/include/asm/Kbuild
include/linux/wait.h
tools/perf/config/Makefile
tools/perf/config/feature-tests.mak

22 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/Kbuild	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/smpboot.c	diff1 \|	diff2 \|	blob \| history
drivers/acpi/processor_idle.c	diff1 \|	diff2 \|	blob \| history
drivers/idle/intel_idle.c	diff1 \|	diff2 \|	blob \| history
include/linux/mm.h	diff1 \|	diff2 \|	blob \| history
include/linux/mm_types.h	diff1 \|	diff2 \|	blob \| history
include/linux/wait.h	diff1 \|	diff2 \|	blob \| history
init/Kconfig	diff1 \|	diff2 \|	blob \| history
init/main.c	diff1 \|	diff2 \|	blob \| history
kernel/Makefile	diff1 \|	diff2 \|	blob \| history
kernel/smp.c	diff1 \|	diff2 \|	blob \| history
tools/perf/config/Makefile	diff1 \|	diff2 \|	blob \| history
tools/perf/config/feature-checks/Makefile	\|	diff2 \|	blob \| history
tools/perf/config/feature-checks/test-all.c	\|	diff2 \|	blob \| history
tools/perf/config/feature-checks/test-libunwind-debug-frame.c	\|	\|	blob

Linux kernel for KaRo TX COM modules

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/Kbuild	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/smpboot.c	diff1 \|	diff2 \|	blob \| history
drivers/acpi/processor_idle.c	diff1 \|	diff2 \|	blob \| history
drivers/idle/intel_idle.c	diff1 \|	diff2 \|	blob \| history
include/linux/mm.h	diff1 \|	diff2 \|	blob \| history
include/linux/mm_types.h	diff1 \|	diff2 \|	blob \| history
include/linux/wait.h	diff1 \|	diff2 \|	blob \| history
init/Kconfig	diff1 \|	diff2 \|	blob \| history
init/main.c	diff1 \|	diff2 \|	blob \| history
kernel/Makefile	diff1 \|	diff2 \|	blob \| history
kernel/smp.c	diff1 \|	diff2 \|	blob \| history
tools/perf/config/Makefile	diff1 \|	diff2 \|	blob \| history
tools/perf/config/feature-checks/Makefile	\|	diff2 \|	blob \| history
tools/perf/config/feature-checks/test-all.c	\|	diff2 \|	blob \| history
tools/perf/config/feature-checks/test-libunwind-debug-frame.c	\|	\|	blob