Merge remote-tracking branch 'driver-core/driver-core-next'

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/extcon/Kconfig
index bf6b2eae5751795139c4c592a1c5bbb24e9c89c6,16716356d1fee89dc4344c08bd0d11b57b87bf85..e175c8ed4ec47667fd9f09514ed2801b51e2c21d
--- 1/drivers/extcon/Kconfig
--- 2/drivers/extcon/Kconfig
+++ b/drivers/extcon/Kconfig
@@@ -21,9 -21,19 +21,19 @@@ config EXTCON_GPI
          Say Y here to enable GPIO based extcon support. Note that GPIO
          extcon supports single state per extcon instance.
  
+ config EXTCON_MAX77693
+       tristate "MAX77693 EXTCON Support"
+       depends on MFD_MAX77693
+       select IRQ_DOMAIN
+       select REGMAP_I2C
+       help
+         If you say yes here you get support for the MUIC device of
+         Maxim MAX77693 PMIC. The MAX77693 MUIC is a USB port accessory
+         detector and switch.
+ 
  config EXTCON_MAX8997
        tristate "MAX8997 EXTCON Support"
 -      depends on MFD_MAX8997
 +      depends on MFD_MAX8997 && IRQ_DOMAIN
        help
          If you say yes here you get support for the MUIC device of
          Maxim MAX8997 PMIC. The MAX8997 MUIC is a USB port accessory

diff --cc drivers/power/ds2781_battery.c
index 0e87e54b4ab13420944577a6679d87c4f72846fa,5f92a4bb33f95aaafe772c3aeea1b2bc54a00186..7a1ff4e4cf9a6452f1b58b2074638aac105cdc93
--- 1/drivers/power/ds2781_battery.c
--- 2/drivers/power/ds2781_battery.c
+++ b/drivers/power/ds2781_battery.c
@@@ -62,14 -61,10 +61,10 @@@ static inline struct power_supply *to_p
  static inline int ds2781_battery_io(struct ds2781_device_info *dev_info,
        char *buf, int addr, size_t count, int io)
  {
-       if (dev_info->mutex_holder == current)
-               return w1_ds2781_io_nolock(dev_info->w1_dev, buf, addr,
-                               count, io);
-       else
-               return w1_ds2781_io(dev_info->w1_dev, buf, addr, count, io);
+       return w1_ds2781_io(dev_info->w1_dev, buf, addr, count, io);
  }
  
 -int w1_ds2781_read(struct ds2781_device_info *dev_info, char *buf,
 +static int w1_ds2781_read(struct ds2781_device_info *dev_info, char *buf,
                int addr, size_t count)
  {
        return ds2781_battery_io(dev_info, buf, addr, count, 0);

diff --cc drivers/w1/masters/omap_hdq.c
Simple merge

diff --cc fs/debugfs/inode.c
Simple merge

diff --cc fs/sysfs/dir.c
index a5cf784f9cc2abec93c2a5272345838e20fb62ad,1cdfb53199aa4057fc824f29d9fd64fb6ee7fcbb..6b0bb00d4d2b6061add5a1f266371df257e5c4a9
--- 1/fs/sysfs/dir.c
--- 2/fs/sysfs/dir.c
+++ b/fs/sysfs/dir.c
@@@ -307,8 -307,9 +307,9 @@@ static int sysfs_dentry_revalidate(stru
  {
        struct sysfs_dirent *sd;
        int is_dir;
+       int type;
  
 -      if (nd->flags & LOOKUP_RCU)
 +      if (flags & LOOKUP_RCU)
                return -ECHILD;
  
        sd = dentry->d_fsdata;

diff --cc include/linux/device.h
index 5083bccae9676779ba4368d84d2672d37e6222ef,5c4495c8fe3facdf11a03d6cea379236e146f108..52a5f15a2223ecb916391138ca9cb44f5d5d108a
--- 1/include/linux/device.h
--- 2/include/linux/device.h
+++ b/include/linux/device.h
@@@ -688,9 -687,13 +688,14 @@@ struct device 
        const struct attribute_group **groups;  /* optional groups */
  
        void    (*release)(struct device *dev);
 +      struct iommu_group      *iommu_group;
  };
  
+ static inline struct device *kobj_to_dev(struct kobject *kobj)
+ {
+       return container_of(kobj, struct device, kobj);
+ }
+ 
  /* Get the wakeup routines, which depend on struct device */
  #include <linux/pm_wakeup.h>
  

diff --cc kernel/printk.c
Simple merge