Merge branch 'dmi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvar...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 16 Jan 2016 02:12:18 +0000 (18:12 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 16 Jan 2016 02:12:18 +0000 (18:12 -0800)
commitd45187aaf0e256d23da2f7694a7826524499aa31
tree6f3075ba02bb8e1efc4e590deef654df8868e6a9
parent4e5448a31d73d0e944b7adb9049438a09bc332cb
parente5b6c1518878e157df4121c1caf70d9c470a6d31
Merge branch 'dmi-for-linus' of git://git./linux/kernel/git/jdelvare/staging

Pull dmi updates from Jean Delvare.

* 'dmi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  firmware: dmi_scan: Save SMBIOS Type 9 System Slots
  firmware: dmi_scan: Fix dmi_find_device description
  firmware: dmi_scan: Clarify dmi_save_extended_devices
  firmware: dmi_scan: Optimize dmi_save_extended_devices