Merge branch 'dmi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvar...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 May 2015 01:02:15 +0000 (18:02 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 May 2015 01:02:15 +0000 (18:02 -0700)
commit3c25a75ee047c3393cc5b995c6c68c8cbdaf02fa
tree8fc5e74ee500ba8b269919a14590b5adddc898c3
parent110bc76729d448fdbcb5cdb63b83d9fd65ce5e26
parent5c1ac56b51b9d222ab202dec1ac2f4215346129d
Merge branch 'dmi-for-linus' of git://git./linux/kernel/git/jdelvare/staging

Pull dmi fixes from Jean Delvare.

* 'dmi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  firmware: dmi_scan: Fix ordering of product_uuid
  firmware: dmi_scan: Simplified displayed version