Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Steve French [Thu, 13 May 2010 22:19:32 +0000 (22:19 +0000)]
Conflicts:
fs/cifs/inode.c

1  2 
fs/cifs/cifsfs.c
fs/cifs/cifsglob.h
fs/cifs/inode.c

Simple merge
Simple merge
diff --cc fs/cifs/inode.c
@@@ -734,7 -744,8 +744,8 @@@ cifs_iget(struct super_block *sb, struc
        unsigned long hash;
        struct inode *inode;
  
+ retry_iget5_locked:
 -      cFYI(1, ("looking for uniqueid=%llu", fattr->cf_uniqueid));
 +      cFYI(1, "looking for uniqueid=%llu", fattr->cf_uniqueid);
  
        /* hash down to 32-bits on 32-bit arch */
        hash = cifs_uniqueid_to_ino_t(fattr->cf_uniqueid);