summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds2008-11-07 00:57:24 +0100
committerLinus Torvalds2008-11-07 00:57:24 +0100
commita15a82f42c5ee519d28f08c932803a9fd5168fc4 (patch)
treee50bfd8ea138e396842f1915260836928dfe6873 /include/linux
parentMerge master.kernel.org:/home/rmk/linux-2.6-arm (diff)
parentRevert "x86: default to reboot via ACPI" (diff)
downloadkernel-qcow2-linux-a15a82f42c5ee519d28f08c932803a9fd5168fc4.tar.gz
kernel-qcow2-linux-a15a82f42c5ee519d28f08c932803a9fd5168fc4.tar.xz
kernel-qcow2-linux-a15a82f42c5ee519d28f08c932803a9fd5168fc4.zip
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: Revert "x86: default to reboot via ACPI" x86: align DirectMap in /proc/meminfo AMD IOMMU: fix lazy IO/TLB flushing in unmap path x86: add smp_mb() before sending INVALIDATE_TLB_VECTOR x86: remove VISWS and PARAVIRT around NR_IRQS puzzle x86: mention ACPI in top-level Kconfig menu x86: size NR_IRQS on 32-bit systems the same way as 64-bit x86: don't allow nr_irqs > NR_IRQS x86/docs: remove noirqbalance param docs x86: don't use tsc_khz to calculate lpj if notsc is passed x86, voyager: fix smp_intr_init() compile breakage AMD IOMMU: fix detection of NP capable IOMMUs
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions