Merge branch 'misc' into release

diff --cc drivers/thermal/thermal_sys.c
Simple merge

diff --cc include/linux/thermal.h
index 7846449,0662690..8651556
--- 1/include/linux/thermal.h
--- 2/include/linux/thermal.h
+++ b/include/linux/thermal.h
@@@ -127,44 -127,10 +127,41 @@@ struct thermal_zone_device 
        struct thermal_hwmon_attr temp_crit;    /* hwmon sys attr */
  #endif
  };
 +/* Adding event notification support elements */
 +#define THERMAL_GENL_FAMILY_NAME                "thermal_event"
 +#define THERMAL_GENL_VERSION                    0x01
 +#define THERMAL_GENL_MCAST_GROUP_NAME           "thermal_mc_group"
 +
 +enum events {
 +      THERMAL_AUX0,
 +      THERMAL_AUX1,
 +      THERMAL_CRITICAL,
 +      THERMAL_DEV_FAULT,
 +};
 +
 +struct thermal_genl_event {
 +      u32 orig;
 +      enum events event;
 +};
 +/* attributes of thermal_genl_family */
 +enum {
 +      THERMAL_GENL_ATTR_UNSPEC,
 +      THERMAL_GENL_ATTR_EVENT,
 +      __THERMAL_GENL_ATTR_MAX,
 +};
 +#define THERMAL_GENL_ATTR_MAX (__THERMAL_GENL_ATTR_MAX - 1)
 +
 +/* commands supported by the thermal_genl_family */
 +enum {
 +      THERMAL_GENL_CMD_UNSPEC,
 +      THERMAL_GENL_CMD_EVENT,
 +      __THERMAL_GENL_CMD_MAX,
 +};
 +#define THERMAL_GENL_CMD_MAX (__THERMAL_GENL_CMD_MAX - 1)
  
  struct thermal_zone_device *thermal_zone_device_register(char *, int, void *,
-                                                        struct
-                                                        thermal_zone_device_ops
-                                                        *, int tc1, int tc2,
-                                                        int passive_freq,
-                                                        int polling_freq);
+               const struct thermal_zone_device_ops *, int tc1, int tc2,
+               int passive_freq, int polling_freq);
  void thermal_zone_device_unregister(struct thermal_zone_device *);
  
  int thermal_zone_bind_cooling_device(struct thermal_zone_device *, int,
@@@ -173,10 -139,7 +170,8 @@@ int thermal_zone_unbind_cooling_device(
                                       struct thermal_cooling_device *);
  void thermal_zone_device_update(struct thermal_zone_device *);
  struct thermal_cooling_device *thermal_cooling_device_register(char *, void *,
-                                                              struct
-                                                              thermal_cooling_device_ops
-                                                              *);
+               const struct thermal_cooling_device_ops *);
  void thermal_cooling_device_unregister(struct thermal_cooling_device *);
 +extern int generate_netlink_event(u32 orig, enum events event);
  
  #endif /* __THERMAL_H__ */