err.no Git - linux-2.6/commit

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)
commit	62ee3e10d3ea11f50bcec8dffb46555fa16d417b
tree	4d0718131216c190bc1ed765ac43409f5ece8405	tree \| snapshot
parent	57c7c3a0fdea95eddcaeba31e7ca7dfc917682ab	commit \| diff
parent	67e2f3285ecff8ceaa555e7614d1603b76e09b95	commit \| diff

hwmon: (dme1737) Fix some merge conflicts

class_dev -> hwmon_dev

Signed-off-by: Mark M. Hoffman <mhoffman@lightlink.com>