summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-01-30 17:08:40 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-01-30 17:08:40 -0800
commitc5d2bc11030568966f04a2af35bacf33d3e37af7 (patch)
tree3ecbdea56f5c46ad80dd0486a37e04de6a7cc95c /Makefile
parent8e2a2880a5c67988104b6f2d5fafac7b78687a9d (diff)
parentad77c3e1808f07fa70f707b1c92a683b7c7d3f85 (diff)
downloadlinux-c5d2bc11030568966f04a2af35bacf33d3e37af7.tar.bz2
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: hwmon: (w83627ehf) Disable setting DC mode for pwm2, pwm3 on NCT6776F hwmon: (sht15) fix bad error code MAINTAINERS: Drop maintainer for MAX1668 hwmon driver MAINTAINERS: Add hwmon entries for Wolfson hwmon: (f71805f) Fix clamping of temperature limits
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions