diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-19 21:38:55 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-19 21:38:55 +0100 |
| commit | dd59f6c76b265ed2ff18b497d6105a9511b1feb1 (patch) | |
| tree | 20b2dada6ef16126c8e4c372d65790cc5b757b86 /fs/nfsd/nfsfh.c | |
| parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | alpha: Convert BUG() to use unreachable() (diff) | |
| download | linux-dd59f6c76b265ed2ff18b497d6105a9511b1feb1.tar.xz linux-dd59f6c76b265ed2ff18b497d6105a9511b1feb1.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6:
alpha: Convert BUG() to use unreachable()
alpha: Add minimal support for software performance events
alpha: Wire up missing/new syscalls
Diffstat (limited to 'fs/nfsd/nfsfh.c')
0 files changed, 0 insertions, 0 deletions