git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

author	Frederic Weisbecker <fweisbec@gmail.com>
	Sat, 17 Oct 2009 23:09:09 +0000 (01:09 +0200)
committer	Frederic Weisbecker <fweisbec@gmail.com>
	Sat, 17 Oct 2009 23:12:33 +0000 (01:12 +0200)
commit	0f8f86c7bdd1c954fbe153af437a0d91a6c5721a
tree	94a8d419a470a4f9852ca397bb9bbe48db92ff5c	tree \| snapshot
parent	dca2d6ac09d9ef59ff46820d4f0c94b08a671202	commit \| diff
parent	f39cdf25bf77219676ec5360980ac40b1a7e144a	commit \| diff

Merge commit 'perf/core' into perf/hw-breakpoint

Conflicts:
kernel/Makefile
kernel/trace/Makefile
kernel/trace/trace.h
samples/Makefile

Merge reason: We need to be uptodate with the perf events development
branch because we plan to rewrite the breakpoints API on top of
perf events.

18 files changed:

arch/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/processor.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/process.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/ptrace.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/signal.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/smpboot.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/traps.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/x86.c	diff1 \|	diff2 \|	blob \| history
arch/x86/power/cpu.c	diff1 \|	diff2 \|	blob \| history
kernel/Makefile	diff1 \|	diff2 \|	blob \| history
kernel/trace/Kconfig	diff1 \|	diff2 \|	blob \| history
kernel/trace/Makefile	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace.h	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace_entries.h	\|	diff2 \|	blob \| history
samples/Kconfig	diff1 \|	diff2 \|	blob \| history
samples/Makefile	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree

RSS Atom

arch/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/processor.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/process.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/ptrace.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/signal.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/smpboot.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/traps.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/x86.c	diff1 \|	diff2 \|	blob \| history
arch/x86/power/cpu.c	diff1 \|	diff2 \|	blob \| history
kernel/Makefile	diff1 \|	diff2 \|	blob \| history
kernel/trace/Kconfig	diff1 \|	diff2 \|	blob \| history
kernel/trace/Makefile	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace.h	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace_entries.h	\|	diff2 \|	blob \| history
samples/Kconfig	diff1 \|	diff2 \|	blob \| history
samples/Makefile	diff1 \|	diff2 \|	blob \| history