diff options
| author |   Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-26 07:22:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-26 07:22:36 -0700 |
| commit | dab5025ca2f704ea6629121446d62e3043b210e9 (patch) | |
| tree | e00007494171934393ab500bce506b03777486c0 /fs/nfs | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| parent | [SCSI] esp: Fix build. (diff) | |
| download | linux-dev-dab5025ca2f704ea6629121446d62e3043b210e9.tar.xz linux-dev-dab5025ca2f704ea6629121446d62e3043b210e9.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SCSI] esp: Fix build.
[SPARC]: Fix SA_STATIC_ALLOC value.
[SPARC64]: Explicitly print return PC when the kernel fault PC is bogus.
Diffstat (limited to 'fs/nfs')
0 files changed, 0 insertions, 0 deletions