Merge branch 'master' into csb1725

[mv-sheeva.git] / drivers / macintosh / ams / ams-core.c

diff --git a/drivers/hwmon/ams/ams-core.c b/drivers/macintosh/ams/ams-core.c
similarity index 100%
rename from drivers/hwmon/ams/ams-core.c
rename to drivers/macintosh/ams/ams-core.c