Merge commit 'v2.6.26' into bkl-removal

diff --cc block/bsg.c
Simple merge

diff --cc drivers/char/agp/frontend.c
Simple merge

diff --cc drivers/char/drm/drm_fops.c
Simple merge

diff --cc drivers/char/ip2/ip2main.c
Simple merge

diff --cc drivers/char/ipmi/ipmi_watchdog.c
Simple merge

diff --cc drivers/char/rtc.c
Simple merge

diff --cc drivers/char/tty_io.c
Simple merge

diff --cc drivers/char/viotape.c
Simple merge

diff --cc drivers/infiniband/core/user_mad.c
Simple merge

diff --cc drivers/infiniband/core/uverbs_main.c
Simple merge

diff --cc drivers/isdn/hardware/eicon/divasmain.c
Simple merge

diff --cc drivers/isdn/i4l/isdn_common.c
Simple merge

diff --cc drivers/macintosh/smu.c
Simple merge

diff --cc drivers/media/video/videodev.c
Simple merge

diff --cc drivers/net/tun.c
Simple merge

diff --cc drivers/s390/char/vmlogrdr.c
Simple merge

diff --cc drivers/sbus/char/bpp.c
Simple merge

diff --cc drivers/scsi/3w-9xxx.c
Simple merge

diff --cc drivers/scsi/ch.c
Simple merge

diff --cc drivers/scsi/osst.c
Simple merge

diff --cc drivers/scsi/sg.c
Simple merge

diff --cc drivers/scsi/st.c
Simple merge

diff --cc drivers/spi/spidev.c
Simple merge

diff --cc drivers/uio/uio.c
Simple merge

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

diff --cc fs/fat/file.c
index bdf91e97397df7e4b26ba4bb8e03637854cb8228,771326b8047e0ff5e3483f885c1edc30a604471a..c672df4036e94cc59aed3c1c59b4fdeb8882fe7a
--- 1/fs/fat/file.c
--- 2/fs/fat/file.c
+++ b/fs/fat/file.c
@@@ -296,9 -307,11 +304,9 @@@ int fat_setattr(struct dentry *dentry, 
  {
        struct msdos_sb_info *sbi = MSDOS_SB(dentry->d_sb);
        struct inode *inode = dentry->d_inode;
-       int mask, error = 0;
+       int error = 0;
        unsigned int ia_valid;
  
 -      lock_kernel();
 -
        /*
         * Expand the file. Since inode_setattr() updates ->i_size
         * before calling the ->truncate(), but FAT needs to fill the
@@@ -341,16 -355,18 +350,17 @@@
                goto out;
        }
  
-       error = inode_setattr(inode, attr);
-       if (error)
-               goto out;
+       /*
+        * We don't return -EPERM here. Yes, strange, but this is too
+        * old behavior.
+        */
+       if (attr->ia_valid & ATTR_MODE) {
+               if (fat_sanitize_mode(sbi, inode, &attr->ia_mode) < 0)
+                       attr->ia_valid &= ~ATTR_MODE;
+       }
  
-       if (S_ISDIR(inode->i_mode))
-               mask = sbi->options.fs_dmask;
-       else
-               mask = sbi->options.fs_fmask;
-       inode->i_mode &= S_IFMT | (S_IRWXUGO & ~mask);
+       error = inode_setattr(inode, attr);
  out:
 -      unlock_kernel();
        return error;
  }
  EXPORT_SYMBOL_GPL(fat_setattr);

diff --cc fs/nfs/file.c
Simple merge

diff --cc fs/ocfs2/stack_user.c
Simple merge

diff --cc include/linux/fs.h
Simple merge

diff --cc sound/core/sound.c
Simple merge