]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 51dcdfe 2c03d07)
Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 7 Apr 2009 15:44:43 +0000 (08:44 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 7 Apr 2009 15:44:43 +0000 (08:44 -0700)
* 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
  hwmon: Add Asus ATK0110 support
  hwmon: (lm95241) Convert to new-style i2c driver

1  2 
drivers/hwmon/Kconfig patch | diff1 | diff2 | blob | history
drivers/hwmon/Makefile patch | diff1 | diff2 | blob | history

diff --cc drivers/hwmon/Kconfig
Simple merge
diff --cc drivers/hwmon/Makefile
Simple merge
Linux kernel for KaRo TX COM modules