Merge remote-tracking branch 'vhost/linux-next'

Conflicts:
drivers/vhost/Makefile

Merge remote-tracking branch 'pinctrl/for-next'

Merge remote-tracking branch 'bcon/master'

Conflicts:
drivers/block/Kconfig

Merge remote-tracking branch 'char-misc/char-misc-next'

Merge remote-tracking branch 'staging/staging-next'

Merge remote-tracking branch 'usb-gadget/next'

Merge remote-tracking branch 'usb/usb-next'

Conflicts:
drivers/usb/host/ehci-timer.c

20130319/tty

Merge remote-tracking branch 'driver-core/driver-core-next'

Merge remote-tracking branch 'leds/for-next'

Merge remote-tracking branch 'regmap/for-next'

Merge remote-tracking branch 'drivers-x86/linux-next'

Conflicts:
drivers/platform/x86/chromeos_laptop.c

Merge remote-tracking branch 'workqueues/for-next'

Merge remote-tracking branch 'xen-two/linux-next'

Merge remote-tracking branch 'kvm/linux-next'

Merge remote-tracking branch 'rcu/rcu/next'

Merge remote-tracking branch 'ftrace/for-next'

Conflicts:
kernel/trace/ftrace.c

Merge remote-tracking branch 'tip/auto-latest'

Merge remote-tracking branch 'spi-mb/spi-next'

Merge remote-tracking branch 'edac-amd/for-next'

Merge remote-tracking branch 'trivial/for-next'

Conflicts:
Documentation/virtual/virtio-spec.txt

Merge remote-tracking branch 'vfio/next'

Merge remote-tracking branch 'iommu/next'

Merge remote-tracking branch 'watchdog/master'

Merge remote-tracking branch 'selinux/master'

Merge remote-tracking branch 'security/next'

Merge remote-tracking branch 'regulator/for-next'

Merge remote-tracking branch 'battery/master'

Merge remote-tracking branch 'mfd/master'

Merge remote-tracking branch 'md/for-next'

Merge remote-tracking branch 'slab/for-next'

Merge remote-tracking branch 'kgdb/kgdb-next'

Merge remote-tracking branch 'mmc/mmc-next'

Merge branch 'device-mapper/master'

Merge remote-tracking branch 'block/for-next'

Merge remote-tracking branch 'cgroup/for-next'

Conflicts:
include/linux/res_counter.h

Merge remote-tracking branch 'input/next'

Merge remote-tracking branch 'virtio/virtio-next'

Merge remote-tracking branch 'modules/modules-next'

20130320/sound-asoc

Merge remote-tracking branch 'sound/for-next'

Merge remote-tracking branch 'drm-intel/drm-intel-next-queued'

Merge remote-tracking branch 'crypto/master'

Merge remote-tracking branch 'l2-mtd/master'

Merge remote-tracking branch 'bluetooth/master'

Merge remote-tracking branch 'wireless-next/master'

Merge remote-tracking branch 'ipsec-next/master'

Merge remote-tracking branch 'net-next/master'

Merge remote-tracking branch 'dmaengine/next'

Conflicts:
drivers/dma/ioat/dma_v3.c

Merge remote-tracking branch 'slave-dma/next'

Merge remote-tracking branch 'target-updates/for-next'

Merge remote-tracking branch 'thermal/next'

Merge remote-tracking branch 'idle/next'

Merge remote-tracking branch 'pm/linux-next'

Merge remote-tracking branch 'pstore/master'

Merge remote-tracking branch 'libata/NEXT'

Merge remote-tracking branch 'kbuild/for-next'

Merge remote-tracking branch 'v4l-dvb/master'

Conflicts:
drivers/media/platform/Kconfig

Merge remote-tracking branch 'hwmon-staging/hwmon-next'

Merge branch 'jdelvare-hwmon/master'

Merge remote-tracking branch 'i2c/i2c/for-next'

Merge remote-tracking branch 'hid/for-next'

Merge remote-tracking branch 'xfs/for-next'

Merge remote-tracking branch 'ubifs/linux-next'

Merge remote-tracking branch 'ocfs2/linux-next'

Merge remote-tracking branch 'nfs/linux-next'

Merge remote-tracking branch 'logfs/master'

Merge remote-tracking branch 'jfs/jfs-next'

Merge remote-tracking branch 'gfs2/master'

Merge remote-tracking branch 'f2fs/dev'

Merge remote-tracking branch 'ext4/dev'

Merge remote-tracking branch 'cifs/for-next'

Merge remote-tracking branch 'btrfs/next'

Merge remote-tracking branch 'tile/master'

Merge remote-tracking branch 'sparc-next/master'

Merge remote-tracking branch 'sh/sh-latest'

Merge remote-tracking branch 's390/features'

Merge remote-tracking branch 'galak/next'

Merge remote-tracking branch 'mpc5xxx/next'

Merge remote-tracking branch 'mips/mips-for-linux-next'

Merge remote-tracking branch 'microblaze/next'

Merge remote-tracking branch 'metag/for-next'

Merge remote-tracking branch 'ia64/next'

Merge remote-tracking branch 'xilinx/arm-next'

Conflicts:
arch/arm/mach-zynq/common.c

Merge remote-tracking branch 'arm/for-next'

Merge remote-tracking branch 'arc/for-next'

Merge remote-tracking branch 'rr-fixes/fixes'

Merge remote-tracking branch 'dwmw2/master'

Merge remote-tracking branch 'ide/master'

Merge remote-tracking branch 'md-current/for-linus'

Merge remote-tracking branch 'char-misc.current/char-misc-linus'

Merge remote-tracking branch 'staging.current/staging-linus'

Merge remote-tracking branch 'usb.current/usb-linus'

Merge remote-tracking branch 'tty.current/tty-linus'

Merge remote-tracking branch 'sound-current/for-linus'

Merge remote-tracking branch 'ipsec/master'

Merge remote-tracking branch 'net/master'

Merge remote-tracking branch 'arc-current/for-curr'

hwmon: (lm75) Add support for the Dallas/Maxim DS7505

Basically it's the same as the original DS75 but much faster.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Guenter Roeck <linux@roeck-us.net>

hwmon: (lm75) Tune resolution and sample time per chip

Most LM75-compatible chips can either sample much faster or with a
much better resolution than the original LM75 chip. So far the lm75
driver did not let the user take benefit of these improvements. Do it
now.

I decided to almost always configure the chip to use the best
resolution possible, which also means the longest sample time. The
only chips for which I didn't are the DS75, DS1775 and STDS75, because
they are really too slow in 12-bit mode (1.2 to 1.5 second worst case)
so I went for 11-bit mode as a more reasonable tradeoff. This choice is
dictated by the fact that the hwmon subsystem is meant for system
monitoring, it has never been supposed to be ultra-fast, and as a
matter of fact we do cache the sampled values in almost all drivers.

If anyone isn't pleased with these default settings, they can always
introduce a platform data structure or DT support for the lm75. That
being said, it seems nobody ever complained that the driver wouldn't
refresh the value faster than every 1.5 second, and the change made
it faster for all chips even in 12-bit mode, so I don't expect any
complaint.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Guenter Roeck <linux@roeck-us.net>