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

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 8c6e549 e041e32)

author	Ingo Molnar <mingo@kernel.org>
	Fri, 6 Jun 2014 05:55:06 +0000 (07:55 +0200)
committer	Ingo Molnar <mingo@kernel.org>
	Fri, 6 Jun 2014 05:55:06 +0000 (07:55 +0200)
commit	ec00010972a0971b2c1da4fbe4e5c7d8ed1ecb05
tree	c28975d7daf6d8a3aa23afe8f42837b71105b269	tree \| snapshot
parent	8c6e549a447c51f4f8c0ba7f1e444469f75a354a	commit \| diff
parent	e041e328c4b41e1db79bfe5ba9992c2ed771ad19	commit \| diff

Merge branch 'perf/urgent' into perf/core, to resolve conflict and to prepare for new patches

Conflicts:
arch/x86/kernel/traps.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>

arch/x86/kernel/process_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/traps.c	diff1 \|	diff2 \|	blob \| history
include/linux/perf_event.h	diff1 \|	diff2 \|	blob \| history
kernel/events/core.c	diff1 \|	diff2 \|	blob \| history
kernel/hrtimer.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/core.c	diff1 \|	diff2 \|	blob \| history
tools/lib/lockdep/Makefile	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree