diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-20 13:11:00 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-20 13:11:00 -0700 |
commit | 807b5169e230b264b7db099f5c694e7df2ff3790 (patch) | |
tree | 6ddd02441c199102d54b7a6e20b4dea2c94b2686 /Documentation | |
parent | 8a6b52140fc41fc5ed7251556035a069486979ab (diff) | |
parent | 64f503076f9921fc714a2c79fb0fa520869d2c08 (diff) | |
download | talos-op-linux-807b5169e230b264b7db099f5c694e7df2ff3790.tar.gz talos-op-linux-807b5169e230b264b7db099f5c694e7df2ff3790.zip |
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
Diffstat (limited to 'Documentation')
0 files changed, 0 insertions, 0 deletions