Jean Delvare
4e7d99e1ac
hwmon: (pc87427) Handle disabled fan inputs properly ...
Most fan input pins of the PC87427 can have alternate functions.
Update the driver to check the configuration register and only support
fan inputs which are really used for fan monitoring.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Guenter Roeck <guenter.roeck@ericsson.com>
2010-08-14 21:08:56 +02:00
Merge branch 'params' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
2010-08-12 10:01:59 -07:00
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
drivers/base/node.c: reduce stack usage of node_read_meminfo()
2010-08-09 20:45:02 -07:00
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
2010-08-06 12:25:06 -07:00
block: push down BKL into .open and .release
2010-08-07 18:25:34 +02:00
Merge branch 'params' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
2010-08-12 10:01:59 -07:00
cpuidle: extend cpuidle and menu governor to handle dynamic states
2010-08-09 20:45:04 -07:00
[S390] zcrypt: fix Kconfig dependencies
2010-08-13 10:06:54 +02:00
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
Merge branch 'stable/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft-2.6
2010-08-13 18:06:15 -07:00
gpiolib: Implement set_debounce for WM831x GPIOs
2010-08-12 11:27:57 +02:00
Merge git://git.infradead.org/~dwmw2/ideapad-2.6
2010-08-13 18:04:52 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2010-08-10 15:08:02 -07:00
hwmon: (pc87427) Handle disabled fan inputs properly
2010-08-14 21:08:56 +02:00
Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
2010-08-12 10:06:29 -07:00
ide: use module_param_named rather than module_param_call
2010-08-11 23:04:39 +09:30
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq
2010-08-04 11:13:36 -07:00
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
Input: fix faulty XXinput_* calls
2010-08-13 12:03:24 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2010-08-13 10:38:12 -07:00
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
2010-08-12 10:06:29 -07:00
dm mpath: support discard
2010-08-12 04:14:32 +01:00
v4l: Remove reference to bkl ioctl in compat ioctl handling
2010-08-14 00:24:24 +02:00
memstick: fix hangs on unexpected device removal in mspro_blk
2010-08-12 08:43:31 -07:00
Merge branch 'params' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
2010-08-12 10:01:59 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6
2010-08-12 10:01:30 -07:00
Merge branch 'params' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
2010-08-12 10:01:59 -07:00
Merge branch 'msm-mmc_sdcc' of git://codeaurora.org/quic/kernel/dwalker/linux-msm
2010-08-13 18:06:37 -07:00
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
pcmcia: xirc2ps_cs bugfix
2010-08-13 16:55:26 -07:00
of/device: Replace struct of_device with struct platform_device
2010-08-06 09:25:50 -06:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2010-08-04 15:31:02 -07:00
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
2010-08-09 21:00:07 -07:00
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
ideapad: Only allow camera state to be set to 0 or 1
2010-08-11 18:00:52 +01:00
Merge git://git.infradead.org/battery-2.6
2010-08-12 09:58:33 -07:00
regulator: Remove default DEBUG define from TPS6586x
2010-08-11 11:38:03 +01:00
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
2010-08-13 10:54:04 -07:00
of/device: Replace struct of_device with struct platform_device
2010-08-06 09:25:50 -06:00
Merge branch 'params' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
2010-08-12 10:01:59 -07:00
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
sh: add a reparent function to DIV6 clocks
2010-08-04 16:12:01 +09:00
of/device: Replace struct of_device with struct platform_device
2010-08-06 09:25:50 -06:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
2010-08-06 12:25:06 -07:00
param: remove unnecessary writable charp
2010-08-11 23:04:27 +09:30
uio: Remove IRQF_DISABLED flag from uio_cif.c
2010-08-05 13:53:33 -07:00
Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
2010-08-12 10:06:29 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
2010-08-04 11:47:58 -07:00
Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
2010-08-12 10:06:29 -07:00
watchdog: hpwdt (12/12): Make NMI decoding a compile-time option
2010-08-13 20:54:53 +00:00
Merge branch 'stable/xen-swiotlb-0.8.6' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
2010-08-12 09:09:41 -07:00
zorro: Fix reading of proc/bus/zorro/* in small chunks
2010-08-09 21:14:08 +02:00
4e7d99e1ac