]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
Merge branch 'dmi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvar...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 19 Dec 2016 16:18:58 +0000 (08:18 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 19 Dec 2016 16:18:58 +0000 (08:18 -0800)
Pull dmi fix from Jean Delvare.

* 'dmi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  firmware: dmi_scan: Always show system identification string


Trivial merge