| commit | 807b5169e230b264b7db099f5c694e7df2ff3790 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Aug 20 13:11:00 2012 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Aug 20 13:11:00 2012 -0700 |
| tree | 6ddd02441c199102d54b7a6e20b4dea2c94b2686 | |
| parent | 8a6b52140fc41fc5ed7251556035a069486979ab [diff] | |
| parent | 64f503076f9921fc714a2c79fb0fa520869d2c08 [diff] |
Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging Pull a hwmon fix from Guenter Roeck: "One patch with section conflict fixes." * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: sections: Fix section conflicts in drivers/hwmon