Merge branch 'dmi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvar...

Pull dmi update from Jean Delvare:
 "Expose SKU ID string as a DMI attribute"

* 'dmi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  firmware: dmi: Add access to the SKU ID string

diff --combined include/linux/mod_devicetable.h
index 2014bd19f28eff41ae37b80eba324644c537e291,61fbfbc03e5bfe90d4f08c8d7554bd973c2eade5..96a71a648eed991530489ecea56b89d8755b395c
--- 1/include/linux/mod_devicetable.h
--- 2/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@@ -471,17 -471,6 +471,17 @@@ struct slim_device_id 
        kernel_ulong_t driver_data;
  };
  
 +#define APR_NAME_SIZE 32
 +#define APR_MODULE_PREFIX "apr:"
 +
 +struct apr_device_id {
 +      char name[APR_NAME_SIZE];
 +      __u32 domain_id;
 +      __u32 svc_id;
 +      __u32 svc_version;
 +      kernel_ulong_t driver_data;     /* Data private to the driver */
 +};
 +
  #define SPMI_NAME_SIZE        32
  #define SPMI_MODULE_PREFIX "spmi:"
  
@@@ -501,6 -490,7 +501,7 @@@ enum dmi_field 
        DMI_PRODUCT_VERSION,
        DMI_PRODUCT_SERIAL,
        DMI_PRODUCT_UUID,
+       DMI_PRODUCT_SKU,
        DMI_PRODUCT_FAMILY,
        DMI_BOARD_VENDOR,
        DMI_BOARD_NAME,