diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-15 14:05:44 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-15 14:05:44 -0800 |
commit | 477d4e4fbedafb1cc636124f2de06defceb399b0 (patch) | |
tree | b855e5b1488f224c08ab2576d0c15e187842cba7 /arch/arm/mach-omap1/include/mach/camera.h | |
parent | fe9d1159b299642f9e1a9b56bbf67a24c31bb418 (diff) | |
parent | 52d159eecced3e4ead901e2a14347f5c11ea4bab (diff) | |
download | op-kernel-dev-477d4e4fbedafb1cc636124f2de06defceb399b0.zip op-kernel-dev-477d4e4fbedafb1cc636124f2de06defceb399b0.tar.gz |
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
hwmon: (w83795) Check for BEEP pin availability
hwmon: (w83795) Clear intrusion alarm immediately
hwmon: (w83795) Read the intrusion state properly
hwmon: (w83795) Print the actual temperature channels as sources
hwmon: (w83795) List all usable temperature sources
hwmon: (w83795) Expose fan control method
hwmon: (w83795) Fix fan control mode attributes
hwmon: (lm95241) Check validity of input values
hwmon: Change mail address of Hans J. Koch
Diffstat (limited to 'arch/arm/mach-omap1/include/mach/camera.h')
0 files changed, 0 insertions, 0 deletions