diff options
author | Ingo Molnar <mingo@elte.hu> | 2012-02-28 19:59:45 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2012-02-28 19:59:47 +0100 |
commit | a706d4fc9e56d8e46393533e0cdca2d35fa5c7e5 (patch) | |
tree | 9fcffea752514702a78a8f6177d995964761559d /arch/m68k/fpsp040/x_fline.S | |
parent | Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
parent | static keys: Introduce 'struct static_key', static_key_true()/false() and sta... (diff) | |
download | linux-a706d4fc9e56d8e46393533e0cdca2d35fa5c7e5.tar.xz linux-a706d4fc9e56d8e46393533e0cdca2d35fa5c7e5.zip |
Merge branch 'perf/jump-labels' into perf/core
Merge reason: After much naming discussion, there seems to be consensus
now - queue it up for v3.4.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/m68k/fpsp040/x_fline.S')
0 files changed, 0 insertions, 0 deletions