Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 300055
b: refs/heads/master
c: 377485f
h: refs/heads/master
i:
  300053: 64bdb3d
  300051: 63bf4ca
  300047: e4da3d2
v: v3
  • Loading branch information
Sasha Levin authored and Linus Torvalds committed May 5, 2012
1 parent 9b548b0 commit 8bcb8cb
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6f24f892871acc47b40dd594c63606a17c714f77
refs/heads/master: 377485f6244af255b04d662cf19cddbbc4ae4310
2 changes: 1 addition & 1 deletion trunk/init/do_mounts.c
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@ void __init change_floppy(char *fmt, ...)
void __init mount_root(void)
{
#ifdef CONFIG_ROOT_NFS
if (MAJOR(ROOT_DEV) == UNNAMED_MAJOR) {
if (ROOT_DEV == Root_NFS) {
if (mount_nfs_root())
return;

Expand Down

0 comments on commit 8bcb8cb

Please sign in to comment.