Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
This commit is contained in:
@@ -1408,7 +1408,7 @@ late_initcall(ip_auto_config);
|
||||
|
||||
/*
|
||||
* Decode any IP configuration options in the "ip=" or "nfsaddrs=" kernel
|
||||
* command line parameter. See Documentation/nfsroot.txt.
|
||||
* command line parameter. See Documentation/filesystems/nfsroot.txt.
|
||||
*/
|
||||
static int __init ic_proto_name(char *name)
|
||||
{
|
||||
|
Reference in New Issue
Block a user