Merge commit 'linus/master' into bkl/core

Merge reason: The staging tree has introduced the easycap
driver lately. We need the latest updates to pushdown the
bkl in its ioctl helper.

diff --cc drivers/media/video/v4l2-dev.c
Simple merge

diff --cc fs/compat_ioctl.c
index 618f38136304ff5cb89e579643c8e4001fb57dba,63ae85831464a7741d89f7160e3cd93512332a4a..5d9b936c458baf9e138640aca5d216775e1c201c
--- 1/fs/compat_ioctl.c
--- 2/fs/compat_ioctl.c
+++ b/fs/compat_ioctl.c
@@@ -577,9 -594,18 +577,12 @@@ static int do_smb_getmountuid(unsigned 
        return err;
  }
  
 -static int ioc_settimeout(unsigned int fd, unsigned int cmd,
 -              compat_ulong_t __user *argp)
 -{
 -      return rw_long(fd, AUTOFS_IOC_SETTIMEOUT, argp);
 -}
 -
  /* Bluetooth ioctls */
- #define HCIUARTSETPROTO       _IOW('U', 200, int)
- #define HCIUARTGETPROTO       _IOR('U', 201, int)
+ #define HCIUARTSETPROTO               _IOW('U', 200, int)
+ #define HCIUARTGETPROTO               _IOR('U', 201, int)
+ #define HCIUARTGETDEVICE      _IOR('U', 202, int)
+ #define HCIUARTSETFLAGS               _IOW('U', 203, int)
+ #define HCIUARTGETFLAGS               _IOR('U', 204, int)
  
  #define BNEPCONNADD   _IOW('B', 200, int)
  #define BNEPCONNDEL   _IOW('B', 201, int)