Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck...
commitd7b96ca5d08a8f2f836feb2b3b3bd721d2837a8e
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 18 Dec 2012 23:06:11 +0000 (18 15:06 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 18 Dec 2012 23:06:11 +0000 (18 15:06 -0800)
treee4700189d9d880489b0aaa69ce6f9ff04f41d12f
parent5b3040a48bc9b916dc318bde33c9ebd98f00fbeb
parent7764b5282e7e04ede3020d86787122887840e016
Merge tag 'hwmon-for-linus' of git://git./linux/kernel/git/groeck/linux-staging

Pull hwmon fixlet from Guenter Roeck:
 "Fix fallout from __devexit removal"

* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (twl4030-madc-hwmon) Fix warning message caused by removal of __devexit