Merge branch 'next-s3c-hwmon' into next-s3c
authorBen Dooks <ben-linux@fluff.org>
Fri, 14 Aug 2009 14:23:15 +0000 (15:23 +0100)
committerBen Dooks <ben-linux@fluff.org>
Fri, 14 Aug 2009 14:23:15 +0000 (15:23 +0100)

Trivial merge