Gong Jun a157d06d4d hwmon: (w83627ehf) Only expose in6 or temp3 on the W83667HG ... The pin for in6 and temp3 is shared on the W83667HG, so only one of these features can be supported on any given system. Let the driver select which one depending on the temp3 disabled bit. Signed-off-by: Gong Jun <JGong@nuvoton.com> Signed-off-by: Jean Delvare <khali@linux-fr.org>		2009-03-30 21:46:43 +02:00
..
accessibility
acpi	Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2	2009-03-27 17:28:43 +01:00
amba	amba: struct device - replace bus_id with dev_name(), dev_set_name()	2009-03-24 16:38:22 -07:00
ata	Merge branch 'origin' into devel	2009-03-28 20:29:51 +00:00
atm	atm: fix non-const printk argument	2009-03-21 19:06:51 -07:00
auxdisplay
base	Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2	2009-03-27 17:28:43 +01:00
block	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k	2009-03-26 16:15:31 -07:00
bluetooth
cdrom
char	Merge branch 'origin' into devel	2009-03-28 20:29:51 +00:00
clocksource	Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2	2009-03-27 17:28:43 +01:00
connector
cpufreq	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq	2009-03-26 11:04:08 -07:00
cpuidle
crypto	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2009-03-26 11:04:34 -07:00
dca	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2009-03-23 09:25:58 -07:00
dio	dio: struct device - replace bus_id with dev_name(), dev_set_name()	2009-03-24 16:38:22 -07:00
dma	Merge branch 'origin' into devel	2009-03-28 20:29:51 +00:00
edac	edac: struct device - replace bus_id with dev_name(), dev_set_name()	2009-03-24 16:38:21 -07:00
eisa	Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2	2009-03-27 17:28:43 +01:00
firewire	firewire: core: optimize propagation of BROADCAST_CHANNEL	2009-03-24 20:56:52 +01:00
firmware
gpio	gpio: struct device - replace bus_id with dev_name(), dev_set_name()	2009-03-24 16:38:23 -07:00
gpu	Merge branch 'linus' into percpu-cpumask-x86-for-linus-2	2009-03-28 04:26:01 +01:00
hid	Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6	2009-03-26 16:14:02 -07:00
hwmon	hwmon: (w83627ehf) Only expose in6 or temp3 on the W83667HG	2009-03-30 21:46:43 +02:00
i2c	Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6	2009-03-28 14:04:53 -07:00
ide	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6	2009-03-26 11:17:04 -07:00
idle
ieee1394	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6	2009-03-27 18:33:56 -07:00
infiniband	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2009-03-28 13:30:43 -07:00
input	Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm	2009-03-28 14:03:14 -07:00
isdn	Merge branch 'master' of /home/davem/src/GIT/linux-2.6/	2009-03-26 15:23:24 -07:00
leds
lguest	Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2	2009-03-27 17:28:43 +01:00
macintosh
mca	mca: struct device - replace bus_id with dev_name(), dev_set_name()	2009-03-24 16:38:23 -07:00
md	dm crypt: wait for endio to complete before destruction	2009-03-16 17:44:36 +00:00
media	Merge branch 'origin' into devel	2009-03-28 20:29:51 +00:00
memstick
message
mfd	mfd: struct device - replace bus_id with dev_name(), dev_set_name()	2009-03-24 16:38:23 -07:00
misc	Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6	2009-03-28 14:04:53 -07:00
mmc	Merge branch 'origin' into devel	2009-03-28 20:29:51 +00:00
mtd	Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm	2009-03-28 14:03:14 -07:00
net	Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm	2009-03-28 14:03:14 -07:00
nubus
of
oprofile
parisc	parisc: sba_iommu: fix build bug when CONFIG_PARISC_AGP=y	2009-03-15 13:36:22 -07:00
parport
pci	Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2	2009-03-27 17:28:43 +01:00
pcmcia	Merge branch 'origin' into devel	2009-03-28 20:29:51 +00:00
platform	Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6	2009-03-26 16:14:02 -07:00
pnp
power
ps3
rapidio	rapidio: struct device - replace bus_id with dev_name(), dev_set_name()	2009-03-24 16:38:21 -07:00
regulator
rtc	Merge branch 'origin' into devel	2009-03-28 20:29:51 +00:00
s390	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2009-03-28 13:30:43 -07:00
sbus	sbus: Auto-load openprom module when device opened.	2009-03-13 14:30:08 -07:00
scsi	Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm	2009-03-28 14:03:14 -07:00
serial	Merge branch 'origin' into devel	2009-03-28 20:29:51 +00:00
sh	maple: fix Error in kernel-doc notation	2009-03-29 08:12:39 -07:00
sn
spi	Merge branch 'origin' into devel	2009-03-28 20:29:51 +00:00
ssb	b43: Add BCM4307 PCI-ID	2009-03-27 20:13:20 -04:00
staging	Merge branch 'topic/snd_card_new-err' into for-linus	2009-03-24 00:35:35 +01:00
tc	tc: struct device - replace bus_id with dev_name(), dev_set_name()	2009-03-24 16:38:22 -07:00
telephony
thermal
uio	UIO: Take offset into account when determining number of pages that can be mapped	2009-03-24 16:38:25 -07:00
usb	Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm	2009-03-28 14:03:14 -07:00
uwb
video	Merge branch 'origin' into devel	2009-03-28 20:29:51 +00:00
virtio
w1	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into devel	2009-03-25 18:31:35 +00:00
watchdog	Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm	2009-03-28 14:03:14 -07:00
xen
zorro	zorro: struct device - replace bus_id with dev_name(), dev_set_name()	2009-03-24 16:38:21 -07:00
Kconfig
Makefile	ide/net: flip the order of SATA and network init	2009-03-28 13:06:16 -07:00