From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 11 Jan 2013 22:56:41 +0000 (-0800)
Subject: Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck... 
X-Git-Tag: firefly_0821_release~3680^2~1274
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b719f43059903820c31edb30f4663a2818836e7f;p=firefly-linux-kernel-4.4.55.git

Merge tag 'hwmon-for-linus' of git://git./linux/kernel/git/groeck/linux-staging

Pull a hwmon patch from Guenter Roeck:
 "Fix build error in vexpress driver"

* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (vexpress) Fix build error seen if CONFIG_OF_DEVICE is not set
---

b719f43059903820c31edb30f4663a2818836e7f