From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 25 Apr 2014 20:12:25 +0000 (-0700)
Subject: Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck... 
X-Git-Tag: MMI-PSA29.97-13-9~12301
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9a60ee117bbeaf2fb9a02ea80a6bdbc2811ca4d2;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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

Pull hwmon fixes from Guenter Roeck:
 - ltc2945: Don't unecessarily crash kernel on implementation error
 - vexpress: Fix 'name' and 'label' attributes

* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (ltc2945) Don't crash the kernel unnecessarily
  hwmon: (vexpress) Avoid creating non-existing attributes
  hwmon: (vexpress) Use legal hwmon device names
---

9a60ee117bbeaf2fb9a02ea80a6bdbc2811ca4d2