From: Mark M. Hoffman <mhoffman@lightlink.com>
Date: Thu, 11 Oct 2007 02:32:50 +0000 (-0400)
Subject: hwmon: (dme1737) Fix some merge conflicts
X-Git-Tag: v2.6.24-rc1~1299^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=62ee3e10d3ea11f50bcec8dffb46555fa16d417b;p=pandora-kernel.git

hwmon: (dme1737) Fix some merge conflicts

class_dev -> hwmon_dev

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

62ee3e10d3ea11f50bcec8dffb46555fa16d417b
Reading git-diff-tree failed