diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-22 20:05:19 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-22 20:05:19 +0100 |
| commit | fc6fc7f1b1095b92d4834e69b385b91e412a7ce5 (patch) | |
| tree | 2ad451d5dac4d460830536944cef1de93be36b2a /Documentation/SAK.txt | |
| parent | x86: select x2apic ops in early apic probe only if x2apic mode is enabled (diff) | |
| parent | PM: Split up sysdev_[suspend|resume] from device_power_[down|up] (diff) | |
| download | linux-fc6fc7f1b1095b92d4834e69b385b91e412a7ce5.tar.xz linux-fc6fc7f1b1095b92d4834e69b385b91e412a7ce5.zip | |
Merge branch 'linus' into x86/apic
Conflicts:
arch/x86/mach-default/setup.c
Semantic conflict resolution:
arch/x86/kernel/setup.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'Documentation/SAK.txt')
0 files changed, 0 insertions, 0 deletions