summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds2010-10-23 17:25:36 +0200
committerLinus Torvalds2010-10-23 17:25:36 +0200
commit02f36038c568111ad4fc433f6fa760ff5e38fab4 (patch)
tree78e6ef15798c6e9d1052eab7f7d3a0db0ec908e5
parentRevert "tty: Add a new file /proc/tty/consoles" (diff)
parentsoftirqs: Make wakeup_softirqd static (diff)
parentx86, asm: Restore parentheses around one pushl_cfi argument (diff)
parentx86, numa: Assign CPUs to nodes in round-robin manner on fake NUMA (diff)
parentx86: HPET force enable for CX700 / VIA Epia LT (diff)
parentx86, setup: Use string copy operation to optimze copy in kernel compression (diff)
parentx86, UV: Use allocated buffer in tlb_uv.c:tunables_read() (diff)
parentx86, vm86: Fix preemption bug for int1 debug and int3 breakpoint handlers. (diff)
downloadkernel-qcow2-linux-02f36038c568111ad4fc433f6fa760ff5e38fab4.tar.gz
kernel-qcow2-linux-02f36038c568111ad4fc433f6fa760ff5e38fab4.tar.xz
kernel-qcow2-linux-02f36038c568111ad4fc433f6fa760ff5e38fab4.zip
Merge branches 'softirq-for-linus', 'x86-debug-for-linus', 'x86-numa-for-linus', 'x86-quirks-for-linus', 'x86-setup-for-linus', 'x86-uv-for-linus' and 'x86-vm86-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'softirq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: softirqs: Make wakeup_softirqd static * 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, asm: Restore parentheses around one pushl_cfi argument x86, asm: Fix ancient-GAS workaround x86, asm: Fix CFI macro invocations to deal with shortcomings in gas * 'x86-numa-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, numa: Assign CPUs to nodes in round-robin manner on fake NUMA * 'x86-quirks-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: HPET force enable for CX700 / VIA Epia LT * 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, setup: Use string copy operation to optimze copy in kernel compression * 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, UV: Use allocated buffer in tlb_uv.c:tunables_read() * 'x86-vm86-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, vm86: Fix preemption bug for int1 debug and int3 breakpoint handlers.