aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/acpi
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-21 16:45:56 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-21 16:45:56 +0200
commit2e2dcc7631e331cf2e8396ce452e7f01e35f1182 (patch)
tree5a02c9602db66bc8c8db9660899c0c4455d7464f /arch/x86/kernel/acpi
parentMerge branches 'x86/urgent', 'x86/amd-iommu', 'x86/apic', 'x86/cleanups', 'x86/core', 'x86/cpu', 'x86/fixmap', 'x86/gart', 'x86/kprobes', 'x86/memtest', 'x86/modules', 'x86/nmi', 'x86/pat', 'x86/reboot', 'x86/setup', 'x86/step', 'x86/unify-pci', 'x86/uv', 'x86/xen' and 'xen-64bit' into x86/for-linus (diff)
parentMerge branch 'linus' into x86/paravirt-spinlocks (diff)
downloadlinux-dev-2e2dcc7631e331cf2e8396ce452e7f01e35f1182.tar.xz
linux-dev-2e2dcc7631e331cf2e8396ce452e7f01e35f1182.zip
Merge branch 'x86/paravirt-spinlocks' into x86/for-linus
Diffstat (limited to 'arch/x86/kernel/acpi')
0 files changed, 0 insertions, 0 deletions