diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-23 08:25:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-23 08:25:36 -0700 |
| commit | 02f36038c568111ad4fc433f6fa760ff5e38fab4 (patch) | |
| tree | 78e6ef15798c6e9d1052eab7f7d3a0db0ec908e5 /include/net/ipip.h | |
| parent | 6c2754c28f2388a276fe21edde826f2113c8f60e (diff) | |
| parent | 676cb02dc32adef13d9efb5ea52079e4ede1e3ec (diff) | |
| parent | 07bd8516a2f967aa67904c68ab97bb896a448b09 (diff) | |
| parent | 50f2d7f682f9c0ed58191d0982fe77888d59d162 (diff) | |
| parent | 892df7f81c31ce7f85778aa78094e8d1f19b8413 (diff) | |
| parent | 68f4d5a00adaab33b136fce2c72d5c377b39b0b0 (diff) | |
| parent | b365a85c68161ea5db5476eb8845a91ceb1777ea (diff) | |
| parent | 6554287b1de0448f1e02e200d02b43914e997d15 (diff) | |
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.