projects / cascardo / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 212d95d db0dc75)
Merge branch 'perf/urgent' into perf/core
authorIngo Molnar <mingo@kernel.org>
Wed, 6 Jun 2012 15:00:37 +0000 (17:00 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 6 Jun 2012 15:22:57 +0000 (17:22 +0200)
Eliminate a conflict in a patch I am going to apply.

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

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.