]> 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)
commit3ca2dd674373b1e28c3a8a7aade3fa62ddd3d70a
tree4fc7f879c32d11d318f411dbe128d080ed8478f9
parent82f37cadbb2c4582e4cac02830e670bfcfb56a68
parent527d72c618ef5a92abed59272112b545e0df7ffc
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