diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-25 13:12:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-25 13:12:25 -0700 |
| commit | 9a60ee117bbeaf2fb9a02ea80a6bdbc2811ca4d2 (patch) | |
| tree | 0f39b8feaec355fd423b909d0ffb0fa0b70d7652 /drivers/rapidio | |
| parent | 6dda80ffa4403123f30fa4c77ad948e7907f9bfb (diff) | |
| parent | f75d72309192e52ef9a3efb390b1c4f408c142df (diff) | |
Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'drivers/rapidio')
0 files changed, 0 insertions, 0 deletions