projects / firefly-linux-kernel-4.4.55.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1977499 bee09ed)
Merge branch 'perf/urgent' into perf/core
authorIngo Molnar <mingo@kernel.org>
Thu, 16 Jan 2014 08:33:30 +0000 (09:33 +0100)
committerIngo Molnar <mingo@kernel.org>
Thu, 16 Jan 2014 08:33:30 +0000 (09:33 +0100)
Pick up the latest fixes, refresh the development tree.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
include/uapi/linux/perf_event.h patch | diff1 | diff2 | blob | history
kernel/events/core.c patch | diff1 | diff2 | blob | history

diff --cc include/uapi/linux/perf_event.h
Simple merge
diff --cc kernel/events/core.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.