diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-12 03:16:25 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-12 03:16:25 +0300 |
commit | 68c3d4b26623e92656588061405d9dbdf97c0706 (patch) | |
tree | ba48630d57d631b6cef22f48ab8581167d46f425 /drivers/block/Makefile | |
parent | f7909fb83550573300e72d120a7d97c9f6b53a65 (diff) | |
parent | bcf721d14d881da86a8defa96bdc9492abe191ae (diff) | |
download | linux-68c3d4b26623e92656588061405d9dbdf97c0706.tar.xz |
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging:
hwmon: (emc1403) Fix I2C address range
hwmon: (lm63) Consider LM64 temperature offset
Diffstat (limited to 'drivers/block/Makefile')
0 files changed, 0 insertions, 0 deletions