diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-01-27 12:01:51 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-01-27 12:01:51 +0100 |
commit | 3ddeb51d9c83931c1ca6abf76a38934c5a1ed918 (patch) | |
tree | fc2efb59d627135ea2199a8a68415b162646b121 /arch/powerpc/sysdev | |
parent | generic, x86: fix __per_cpu_load relocation (diff) | |
parent | Fix "multiple definition of `debugfs_create_size_t'" (diff) | |
download | linux-3ddeb51d9c83931c1ca6abf76a38934c5a1ed918.tar.xz linux-3ddeb51d9c83931c1ca6abf76a38934c5a1ed918.zip |
Merge branch 'linus' into core/percpu
Conflicts:
arch/x86/kernel/setup_percpu.c
Diffstat (limited to 'arch/powerpc/sysdev')
0 files changed, 0 insertions, 0 deletions