git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
57c7c3a
67e2f32
)
hwmon: (dme1737) Fix some merge conflicts
author
Mark M. Hoffman
<mhoffman@lightlink.com>
Thu, 11 Oct 2007 02:32:50 +0000
(22:32 -0400)
committer
Mark M. Hoffman
<mhoffman@lightlink.com>
Thu, 11 Oct 2007 02:45:54 +0000
(22:45 -0400)
class_dev -> hwmon_dev
Signed-off-by: Mark M. Hoffman <mhoffman@lightlink.com>
Trivial merge