Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6:
  remove "struct subsystem" as it is no longer needed
  sysfs: printk format warning
  DOC: Fix wrong identifier name in Documentation/driver-model/devres.txt
  platform: reorder platform_device_del
  Driver core: fix show_uevent from taking up way too much stack

diff --combined include/linux/device.h
index ff83b61,ee292fe..6579068
--- 1/include/linux/device.h
--- 2/include/linux/device.h
+++ b/include/linux/device.h
@@@ -53,7 -53,7 +53,7 @@@ struct bus_type 
        const char              * name;
        struct module           * owner;
  
-       struct subsystem        subsys;
+       struct kset             subsys;
        struct kset             drivers;
        struct kset             devices;
        struct klist            klist_devices;
@@@ -80,6 -80,7 +80,6 @@@
        int (*resume)(struct device * dev);
  
        unsigned int drivers_autoprobe:1;
 -      unsigned int multithread_probe:1;
  };
  
  extern int __must_check bus_register(struct bus_type * bus);
@@@ -178,7 -179,7 +178,7 @@@ struct class 
        const char              * name;
        struct module           * owner;
  
-       struct subsystem        subsys;
+       struct kset             subsys;
        struct list_head        children;
        struct list_head        devices;
        struct list_head        interfaces;
@@@ -558,8 -559,8 +558,8 @@@ extern void device_shutdown(void)
  
  
  /* drivers/base/firmware.c */
- extern int __must_check firmware_register(struct subsystem *);
- extern void firmware_unregister(struct subsystem *);
+ extern int __must_check firmware_register(struct kset *);
+ extern void firmware_unregister(struct kset *);
  
  /* debugging and troubleshooting/diagnostic helpers. */
  extern const char *dev_driver_string(struct device *dev);