projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 474a503 384e724)
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 11 Oct 2009 18:23:33 +0000 (11:23 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 11 Oct 2009 18:23:33 +0000 (11:23 -0700)
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  hwmon: (s3c-hwmon) Disable build for S3C64xx
  MAINTAINERS: Fix Riku Voipio's address
  hwmon: (asus_atk0110) Enable the EC
  hwmon: (asus_atk0110) Refactor the code
  hwmon: (sht15) Fix spurious section mismatch warning

1  2 
MAINTAINERS patch | diff1 | diff2 | blob | history
drivers/hwmon/sht15.c patch | diff1 | diff2 | blob | history

diff --cc MAINTAINERS
Simple merge
diff --cc drivers/hwmon/sht15.c
Simple merge
John Crispins staging tree