Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:
	fs/cifs/inode.c

diff --cc fs/cifs/cifsfs.c
Simple merge

diff --cc fs/cifs/cifsglob.h
Simple merge

diff --cc fs/cifs/inode.c
index b35cb03,29b9ea2..5b042fc
--- 1/fs/cifs/inode.c
--- 2/fs/cifs/inode.c
+++ b/fs/cifs/inode.c
@@@ -734,7 -744,8 +744,8 @@@ cifs_iget(struct super_block *sb, struc
        unsigned long hash;
        struct inode *inode;
  
 -      cFYI(1, ("looking for uniqueid=%llu", fattr->cf_uniqueid));
+ retry_iget5_locked:
 +      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);