diff options
| author | Ingo Molnar <[email protected]> | 2012-06-18 09:09:49 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2012-06-18 09:09:49 +0000 |
| commit | 8461689c67fc2ad3040bc019cccb541bccb5648f (patch) | |
| tree | eafcf756975739ef04aa91be2e053d6e1e8b9ccb /fs/jbd2/commit.c | |
| parent | x86/vsmp: Fix linker error when CONFIG_PROC_FS is not set (diff) | |
| parent | irq/apic: Use config_enabled(CONFIG_SMP) checks to clean up irq_set_affinity(... (diff) | |
| download | kernel-8461689c67fc2ad3040bc019cccb541bccb5648f.tar.gz kernel-8461689c67fc2ad3040bc019cccb541bccb5648f.zip | |
Merge branch 'x86/apic' into x86/platform
Merge in x86/apic to solve a vector_allocation_domain() API change semantic merge conflict.
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'fs/jbd2/commit.c')
0 files changed, 0 insertions, 0 deletions