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)
commit63c949ea1dcf5d46789f13d8e9c21bb8aeb605cb
treeca8e063aed16c0a5e5f51557861dbbad77da8bbb
parent9b71de49b030ad8fd4d13d38571b5c42dc9ed8dd
parentbff78650a2b0ed42b8fb134b6a9b387e00027d67
Merge branch 'next-s3c-hwmon' into next-s3c