Merge branch 'next-s3c-hwmon' into next-s3c