]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'perf/urgent' into perf/core, to avoid conflicts
authorIngo Molnar <mingo@kernel.org>
Wed, 7 May 2014 11:39:22 +0000 (13:39 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 7 May 2014 11:39:22 +0000 (13:39 +0200)
commit218230d9f73fe28c778b91eee40ee6111121513d
tree4fc7f879c32d11d318f411dbe128d080ed8478f9
parent250139a2d7895ffd7543f7e8608663542c677b10
parent0a36848bbb15dae4ba0923ba1c12afcfa5ccd23a
Merge branch 'perf/urgent' into perf/core, to avoid conflicts

Signed-off-by: Ingo Molnar <mingo@kernel.org>
kernel/events/core.c
kernel/hrtimer.c