diff options
author | Ingo Molnar <mingo@elte.hu> | 2011-05-20 08:54:05 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-05-20 08:54:08 +0200 |
commit | c16dbd54a3fe126b539a0ef149d80221c667bbd5 (patch) | |
tree | 297a9b616ac100d8773373bd0cbf3fb4eb9d87a7 /arch/alpha/kernel | |
parent | selinux: avoid unnecessary avc cache stat hit count (diff) | |
parent | core_kernel_data(): Fix architectures that do not define _sdata (diff) | |
download | linux-c16dbd54a3fe126b539a0ef149d80221c667bbd5.tar.xz linux-c16dbd54a3fe126b539a0ef149d80221c667bbd5.zip |
Merge branch 'perf/core' into perf/urgent
Merge reason: One pending commit was left in perf/core after Linus merged
perf/core - continue v2.6.40 work in the perf/urgent reason.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/alpha/kernel')
0 files changed, 0 insertions, 0 deletions