diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 23:36:17 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 23:36:17 -0400 |
| commit | c00046c279a2521075250fad682ca0acc10d4fd7 (patch) | |
| tree | 78a7e9089c26f199ad9b0161bb564b7c1ca6daf9 /fs/nfs | |
| parent | 9abbf7d028b1598b40ebdc81c48f30da7f3d5bf5 (diff) | |
| parent | 8e8a1407ac23b43cec0412338c1b4f5e1c664550 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (74 commits)
fix do_sys_open() prototype
sysfs: trivial: fix sysfs_create_file kerneldoc spelling mistake
Documentation: Fix typo in SubmitChecklist.
Typo: depricated -> deprecated
Add missing profile=kvm option to Documentation/kernel-parameters.txt
fix typo about TBI in e1000 comment
proc.txt: Add /proc/stat field
small documentation fixes
Fix compiler warning in smount example program from sharedsubtree.txt
docs/sysfs: add missing word to sysfs attribute explanation
documentation/ext3: grammar fixes
Documentation/java.txt: typo and grammar fixes
Documentation/filesystems/vfs.txt: typo fix
include/asm-*/system.h: remove unused set_rmb(), set_wmb() macros
trivial copy_data_pages() tidy up
Fix typo in arch/x86/kernel/tsc_32.c
file link fix for Pegasus USB net driver help
remove unused return within void return function
Typo fixes retrun -> return
x86 hpet.h: remove broken links
...
Diffstat (limited to 'fs/nfs')
| -rw-r--r-- | fs/nfs/nfsroot.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/nfsroot.c b/fs/nfs/nfsroot.c index e87b44ee9ac9..4b0334590ee5 100644 --- a/fs/nfs/nfsroot.c +++ b/fs/nfs/nfsroot.c | |||
| @@ -43,7 +43,7 @@ | |||
| 43 | * from being used (thanks to Leo Spiekman) | 43 | * from being used (thanks to Leo Spiekman) |
| 44 | * Andy Walker : Allow to specify the NFS server in nfs_root | 44 | * Andy Walker : Allow to specify the NFS server in nfs_root |
| 45 | * without giving a path name | 45 | * without giving a path name |
| 46 | * Swen Thümmler : Allow to specify the NFS options in nfs_root | 46 | * Swen Thümmler : Allow to specify the NFS options in nfs_root |
| 47 | * without giving a path name. Fix BOOTP request | 47 | * without giving a path name. Fix BOOTP request |
| 48 | * for domainname (domainname is NIS domain, not | 48 | * for domainname (domainname is NIS domain, not |
| 49 | * DNS domain!). Skip dummy devices for BOOTP. | 49 | * DNS domain!). Skip dummy devices for BOOTP. |