diff options
author | 2009-12-03 20:10:59 +0100 | |
---|---|---|
committer | 2009-12-03 20:11:06 +0100 | |
commit | 26fb20d008d841268545c25bb183f21ed16db891 (patch) | |
tree | 4e14dc653d0e6b5d43c2bb8f55b795b232200698 /fs/proc/array.c | |
parent | Merge branch 'perf/scripting' into perf/core (diff) | |
parent | x86, mce: Add __cpuinit to hotplug callback functions (diff) | |
download | linux-dev-26fb20d008d841268545c25bb183f21ed16db891.tar.xz linux-dev-26fb20d008d841268545c25bb183f21ed16db891.zip |
Merge branch 'perf/mce' into perf/core
Merge reason: It's ready for v2.6.33.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/proc/array.c')
0 files changed, 0 insertions, 0 deletions