Commit e19eede5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull dmi update from Jean Delvare.

* 'dmi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  MAINTAINERS: The DMI/SMBIOS tree has moved
  firmware/dmi: Include product_sku info to modalias
parents f0728bfe 3cb4d29a

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -5443,7 +5443,7 @@ F: drivers/hwmon/dme1737.c 
DMI/SMBIOS SUPPORT

M:	Jean Delvare <jdelvare@suse.com>

S:	Maintained

T:	quilt http://jdelvare.nerim.net/devel/linux/jdelvare-dmi/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git dmi-for-next

F:	Documentation/ABI/testing/sysfs-firmware-dmi-tables

F:	drivers/firmware/dmi-id.c

F:	drivers/firmware/dmi_scan.c

drivers/firmware/dmi-id.c

+1 −0
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ static ssize_t get_modalias(char *buffer, size_t buffer_size) 
		{ "svn", DMI_SYS_VENDOR },

		{ "pn",  DMI_PRODUCT_NAME },

		{ "pvr", DMI_PRODUCT_VERSION },

		{ "sku", DMI_PRODUCT_SKU },

		{ "rvn", DMI_BOARD_VENDOR },

		{ "rn",  DMI_BOARD_NAME },

		{ "rvr", DMI_BOARD_VERSION },