Merge tag 'driver-core-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull driver core changes from Greg Kroah-Hartman:
 "Here's the big driver core pull request for 3.6-rc1.

  Unlike 3.5, this kernel should be a lot tamer, with the printk changes
  now settled down.  All we have here is some extcon driver updates, w1
  driver updates, a few printk cleanups that weren't needed for 3.5, but
  are good to have now, and some other minor fixes/changes in the driver
  core.

  All of these have been in the linux-next releases for a while now.

  Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
* tag 'driver-core-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (38 commits)
  printk: Export struct log size and member offsets through vmcoreinfo
  Drivers: hv: Change the hex constant to a decimal constant
  driver core: don't trigger uevent after failure
  extcon: MAX77693: Add extcon-max77693 driver to support Maxim MAX77693 MUIC device
  sysfs: fail dentry revalidation after namespace change fix
  sysfs: fail dentry revalidation after namespace change
  extcon: spelling of detach in function doc
  extcon: arizona: Stop microphone detection if we give up on it
  extcon: arizona: Update cable reporting calls and split headset
  PM / Runtime: Do not increment device usage counts before probing
  kmsg - do not flush partial lines when the console is busy
  kmsg - export "continuation record" flag to /dev/kmsg
  kmsg - avoid warning for CONFIG_PRINTK=n compilations
  kmsg - properly print over-long continuation lines
  driver-core: Use kobj_to_dev instead of re-implementing it
  driver-core: Move kobj_to_dev from genhd.h to device.h
  driver core: Move deferred devices to the end of dpm_list before probing
  driver core: move uevent call to driver_register
  driver core: fix shutdown races with probe/remove(v3)
  Extcon: Arizona: Add driver for Wolfson Arizona class devices
  ...

diff --cc MAINTAINERS
Simple merge

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