Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groec...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 24 Nov 2010 23:36:24 +0000 (08:36 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 24 Nov 2010 23:36:24 +0000 (08:36 +0900)
commit698fd6a2c3ca05ec796072defb5c415289a86cdc
treedac9d59ed860d3d15322d63f4ad8f2dc36032600
parent8a3fbc9fdb4fd8f0970ab1a98f694ff25b7d5b47
parent32292f49f9683622ad0fb95a8c754910121e7b16
Merge branch 'hwmon-for-linus' of git://git./linux/kernel/git/groeck/staging

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging:
  hwmon: (lis3lv02d_i2c) Fix compile warnings
  hwmon: (i5k_amb) Fix compile warning