]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 19 Jul 2013 00:55:31 +0000 (10:55 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 19 Jul 2013 00:55:31 +0000 (10:55 +1000)
commit0abeca1a2323296b17beeb0e9e52e64d1c299d10
treeb1656b594fa60fa0563a4da27df5feec9bdd1b7b
parentd0e9c5c81a328a2b3a87f3135db017a27f1d62a1
parent7de362d0eb2fba88ade771927775757cff270d0a
Merge remote-tracking branch 'hwmon-staging/hwmon-next'

Conflicts:
drivers/hwmon/coretemp.c
drivers/hwmon/coretemp.c