diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-08 20:14:32 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-08 20:14:32 +0200 |
commit | 8d659f5e43c5db2630e85f507b7384365e9e1c1e (patch) | |
tree | c99b00949268cedbbc4bc1f3e01b058e67033c2e /fs/nfsd | |
parent | powerpc: Do not ignore arch/powerpc/include (diff) | |
parent | sparc64: Fix end-of-stack checking in save_stack_trace(). (diff) | |
download | linux-8d659f5e43c5db2630e85f507b7384365e9e1c1e.tar.xz linux-8d659f5e43c5db2630e85f507b7384365e9e1c1e.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc64: Fix end-of-stack checking in save_stack_trace().
sparc: don't use asm/of_device.h
sparc64: Use kernel/uid16.c helpers instead of own copy.
of/sparc: remove include of linux/of_platform.h from asm/of_platform.h
sparc: i8042-sparcio.h: fix warning
Diffstat (limited to 'fs/nfsd')
0 files changed, 0 insertions, 0 deletions