diff options
| author | Mark M. Hoffman <mhoffman@lightlink.com> | 2007-10-10 22:32:50 -0400 |
|---|---|---|
| committer | Mark M. Hoffman <mhoffman@lightlink.com> | 2007-10-10 22:45:54 -0400 |
| commit | 62ee3e10d3ea11f50bcec8dffb46555fa16d417b (patch) | |
| tree | 4d0718131216c190bc1ed765ac43409f5ece8405 /include/asm-blackfin/semaphore.h | |
| parent | 57c7c3a0fdea95eddcaeba31e7ca7dfc917682ab (diff) | |
| parent | 67e2f3285ecff8ceaa555e7614d1603b76e09b95 (diff) | |
hwmon: (dme1737) Fix some merge conflicts
class_dev -> hwmon_dev
Signed-off-by: Mark M. Hoffman <mhoffman@lightlink.com>
Diffstat (limited to 'include/asm-blackfin/semaphore.h')
0 files changed, 0 insertions, 0 deletions