Conflicts:
	drivers/media/video/sh_mobile_ceu_camera.c

Conflicts:
	arch/powerpc/kernel/pci_64.c

Conflicts:
	fs/xfs/linux-2.6/xfs_lrw.c

Conflicts:
	fs/ubifs/super.c

Conflicts:
	arch/sh/kernel/vmlinux.lds.S

Conflicts:
	arch/parisc/include/asm/thread_info.h
	arch/parisc/kernel/entry.S
	arch/parisc/kernel/signal.c

Conflicts:
	kernel/gcov/Kconfig

Conflicts:
	arch/arm/include/asm/unified.h

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

The Winbond/Nuvoton WPCD377I is the reduced version of a Super-I/O
which emulates the National Semiconductor LM96000 hardware monitoring
chips, but without the hardware monitoring part. Instead of plain
disabling the emulation, the vendor left the emulated chip visible,
but all monitored values are always zero. This is rather confusing for
the users. So detect this case and refuse to bind to such fake chips.

This fixes lm-sensors ticket #2182:
http://www.lm-sensors.org/ticket/2182Signed-off-by: Jean Delvare <khali@linux-fr.org>

Clean up the pcf8591 driver documentation:
* The PCF8591 chip is now an NXP product.
* Fix a sysfs path.
* Fix the name of sysfs attributes.
* And a few other random fixes.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Aurelien Jarno <aurelien@aurel32.net>

Now that we have ACPI-based hardware monitoring drivers, and we will
start telling users to use them instead of native drivers when I/O
resources conflict, I think it would be good to clearly mark ACPI
drivers as such in Kconfig.

Also, in the case of monolithic kernels, I think the ACPI drivers
should take precedence over native drivers, so they should be listed
first in Makefile.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Luca Tettamanti <kronos.it@gmail.com>

Use the function resource_size, which reduces the chance of introducing
off-by-one errors in calculating the resource size.

The semantic patch that makes this change is as follows:
(http://www.emn.fr/x-info/coccinelle/)

// <smpl>
@@
struct resource *res;
@@

- (res->end - res->start) + 1
+ resource_size(res)
// </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Jean Delvare <khali@linux-fr.org>