diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-22 17:54:21 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-22 17:54:21 +0200 |
| commit | 91151240ed8e97cc4457dae4094153c2744f1eb8 (patch) | |
| tree | 201a449a659bcc31cf528f4630b8ec4c49b26f02 /arch/um/drivers/ubd_kern.c | |
| parent | Merge branch 'x86-timers-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| parent | x86, 32-bit: Align percpu area and irq stacks to THREAD_SIZE (diff) | |
| download | linux-91151240ed8e97cc4457dae4094153c2744f1eb8.tar.xz linux-91151240ed8e97cc4457dae4094153c2744f1eb8.zip | |
Merge branch 'x86-irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, 32-bit: Align percpu area and irq stacks to THREAD_SIZE
x86: Move alloc_desk_mask variables inside ifdef
x86-32: Align IRQ stacks properly
x86: Remove CONFIG_4KSTACKS
x86: Always use irq stacks
Fixed up trivial conflicts in include/linux/{irq.h, percpu-defs.h}
Diffstat (limited to 'arch/um/drivers/ubd_kern.c')
0 files changed, 0 insertions, 0 deletions