Merge branch 'dmi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvar...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 18 Jun 2018 04:43:09 +0000 (13:43 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 18 Jun 2018 04:43:09 +0000 (13:43 +0900)
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

1  2 
include/linux/mod_devicetable.h

Simple merge