summaryrefslogtreecommitdiffstats
path: root/fs/ncpfs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-10-22 17:54:21 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-22 17:54:21 +0200
commit91151240ed8e97cc4457dae4094153c2744f1eb8 (patch)
tree201a449a659bcc31cf528f4630b8ec4c49b26f02 /fs/ncpfs
parentMerge branch 'x86-timers-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff)
parentx86, 32-bit: Align percpu area and irq stacks to THREAD_SIZE (diff)
downloadlinux-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 'fs/ncpfs')
0 files changed, 0 insertions, 0 deletions