Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

Conflicts:

	fs/nfs/inode.c
	fs/super.c

Fix conflicts between patch 'NFS: Split fs/nfs/inode.c' and patch
'VFS: Permit filesystem to override root dentry on mount'

1 files changed, 3 insertions, 4 deletions

diff --git a/drivers/md/raid6algos.c b/drivers/md/raid6algos.c
index 51c63c0cf1c9..926576156578 100644
--- a/drivers/md/raid6algos.c
+++ b/drivers/md/raid6algos.c
@@ -139,15 +139,14 @@ int __init raid6_select_algo(void)
                 }
         }
 
-        if ( best )
+        if (best) {
                 printk("raid6: using algorithm %s (%ld MB/s)\n",
                        best->name,
                        (bestperf*HZ) >> (20-16+RAID6_TIME_JIFFIES_LG2));
-        else
+                raid6_call = *best;
+        } else
                 printk("raid6: Yikes!  No algorithm found!\n");
 
-        raid6_call = *best;
-
         free_pages((unsigned long)syndromes, 1);
 
         return best ? 0 : -EINVAL;