]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4738f70 7d758f4)
Merge commit 'v2.6.34-rc1' into perf/urgent
authorIngo Molnar <mingo@elte.hu>
Tue, 9 Mar 2010 16:11:53 +0000 (17:11 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 9 Mar 2010 16:11:53 +0000 (17:11 +0100)
commit9fef814389c20be612be1563d0a6429951daf8fa
tree0ab0300e23a02df0fe3c0579627e4998bb122c00tree | snapshot
parent4738f705f677146316952c5a32472e7cb5316f2ccommit | diff
parent7d758f45a3d15290986eed04eb85a1b7f6b8a152commit | diff
Merge commit 'v2.6.34-rc1' into perf/urgent

Conflicts:
tools/perf/util/probe-event.c

Merge reason: Pick up -rc1 and resolve the conflict as well.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
MAINTAINERS diff1 | diff2 | blob | history
arch/x86/kernel/cpu/perf_event.c diff1 | diff2 | blob | history
arch/x86/kernel/cpu/perf_event_intel.c diff1 | diff2 | blob | history
arch/x86/kernel/dumpstack_64.c diff1 | diff2 | blob | history
kernel/perf_event.c diff1 | diff2 | blob | history
lib/Kconfig.debug diff1 | diff2 | blob | history
tools/perf/util/probe-event.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.