summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-01-27 12:03:24 +0100
committerIngo Molnar <mingo@elte.hu>2009-01-27 12:03:24 +0100
commit4369f1fb7cd4cf777312f43e1cb9aa5504fc4125 (patch)
treea5525d63fe682e6744c109fb72f7e1b33855cb00 /drivers
parent3ddeb51d9c83931c1ca6abf76a38934c5a1ed918 (diff)
parentcf3997f507624757f149fcc42b76fb03c151fb65 (diff)
Merge branch 'tj-percpu' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into core/percpu
Conflicts: arch/x86/kernel/setup_percpu.c Semantic conflict: arch/x86/kernel/cpu/common.c Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers')
0 files changed, 0 insertions, 0 deletions