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

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

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 9 Apr 2015 05:13:12 +0000 (15:13 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 9 Apr 2015 05:13:16 +0000 (15:13 +1000)
commit	5cd181c125b603fdca603e00d9a859abc50dc40a
tree	b2626a7b7a85116b838ba1aee7514768c08a23fa	tree \| snapshot
parent	42009ed7f145ad46ec4dd70a1e75dc0d00d7e61a	commit \| diff
parent	05154531bcc326728b75f5138e028eb1913a6880	commit \| diff

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

Conflicts:
include/linux/bpf.h
include/uapi/linux/bpf.h
samples/bpf/Makefile

28 files changed:

Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/vdso.c	diff1 \|	\|	blob \| history
arch/arm/mach-omap2/cpuidle44xx.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/cpuidle-tegra20.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/cpuidle-tegra30.c	diff1 \|	diff2 \|	blob \| history
arch/mips/lasat/sysctl.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/perf/core-book3s.c	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/include/uapi/asm/msr-index.h	diff1 \|	diff2 \|	blob \| history
arch/x86/lguest/boot.c	diff1 \|	diff2 \|	blob \| history
drivers/acpi/processor_idle.c	diff1 \|	diff2 \|	blob \| history
drivers/clocksource/arm_arch_timer.c	diff1 \|	diff2 \|	blob \| history
drivers/idle/intel_idle.c	diff1 \|	diff2 \|	blob \| history
include/linux/clocksource.h	diff1 \|	diff2 \|	blob \| history
include/linux/tick.h	diff1 \|	diff2 \|	blob \| history
include/linux/vfio.h	diff1 \|	diff2 \|	blob \| history
include/uapi/linux/bpf.h	diff1 \|	diff2 \|	blob \| history
init/Kconfig	diff1 \|	diff2 \|	blob \| history
kernel/bpf/syscall.c	diff1 \|	diff2 \|	blob \| history
kernel/events/core.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/fair.c	diff1 \|	diff2 \|	blob \| history
lib/Kconfig.debug	diff1 \|	diff2 \|	blob \| history
samples/bpf/Makefile	diff1 \|	diff2 \|	blob \| history
samples/bpf/bpf_helpers.h	diff1 \|	diff2 \|	blob \| history
samples/bpf/libbpf.h	diff1 \|	diff2 \|	blob \| history
samples/bpf/test_verifier.c	diff1 \|	diff2 \|	blob \| history
tools/perf/util/probe-finder.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules

Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/vdso.c	diff1 \|	\|	blob \| history
arch/arm/mach-omap2/cpuidle44xx.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/cpuidle-tegra20.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/cpuidle-tegra30.c	diff1 \|	diff2 \|	blob \| history
arch/mips/lasat/sysctl.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/perf/core-book3s.c	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/include/uapi/asm/msr-index.h	diff1 \|	diff2 \|	blob \| history
arch/x86/lguest/boot.c	diff1 \|	diff2 \|	blob \| history
drivers/acpi/processor_idle.c	diff1 \|	diff2 \|	blob \| history
drivers/clocksource/arm_arch_timer.c	diff1 \|	diff2 \|	blob \| history
drivers/idle/intel_idle.c	diff1 \|	diff2 \|	blob \| history
include/linux/clocksource.h	diff1 \|	diff2 \|	blob \| history
include/linux/tick.h	diff1 \|	diff2 \|	blob \| history
include/linux/vfio.h	diff1 \|	diff2 \|	blob \| history
include/uapi/linux/bpf.h	diff1 \|	diff2 \|	blob \| history
init/Kconfig	diff1 \|	diff2 \|	blob \| history
kernel/bpf/syscall.c	diff1 \|	diff2 \|	blob \| history
kernel/events/core.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/fair.c	diff1 \|	diff2 \|	blob \| history
lib/Kconfig.debug	diff1 \|	diff2 \|	blob \| history
samples/bpf/Makefile	diff1 \|	diff2 \|	blob \| history
samples/bpf/bpf_helpers.h	diff1 \|	diff2 \|	blob \| history
samples/bpf/libbpf.h	diff1 \|	diff2 \|	blob \| history
samples/bpf/test_verifier.c	diff1 \|	diff2 \|	blob \| history
tools/perf/util/probe-finder.c	diff1 \|	diff2 \|	blob \| history