Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ed214ac authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'char-misc-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc 

Pull char/misc driver patches from Greg Kroah-Hartman:
 "Here's the big char/misc driver patches for 3.9-rc1.

  Nothing major here, just lots of different driver updates (mei,
  hyperv, ipack, extcon, vmci, etc.).

  All of these have been in the linux-next tree for a while."

* tag 'char-misc-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (209 commits)
  w1: w1_therm: Add force-pullup option for "broken" sensors
  w1: ds2482: Added 1-Wire pull-up support to the driver
  vme: add missing put_device() after device_register() fails
  extcon: max8997: Use workqueue to check cable state after completing boot of platform
  extcon: max8997: Set default UART/USB path on probe
  extcon: max8997: Consolidate duplicate code for checking ADC/CHG cable type
  extcon: max8997: Set default of ADC debounce time during initialization
  extcon: max8997: Remove duplicate code related to set H/W line path
  extcon: max8997: Move defined constant to header file
  extcon: max77693: Make max77693_extcon_cable static
  extcon: max8997: Remove unreachable code
  extcon: max8997: Make max8997_extcon_cable static
  extcon: max77693: Remove unnecessary goto statement to improve readability
  extcon: max77693: Convert to devm_input_allocate_device()
  extcon: gpio: Rename filename of extcon-gpio.c according to kernel naming style
  CREDITS: update email and address of Harald Hoyer
  extcon: arizona: Use MICDET for final microphone identification
  extcon: arizona: Always take the first HPDET reading as the final one
  extcon: arizona: Clear _trig_sts bits after jack detection
  extcon: arizona: Don't HPDET magic when headphones are enabled
  ...
parents 21eaab6d 29e5507a

CREDITS

+4 −4
Original line number Original line Diff line number Diff line
@@ -1572,12 +1572,12 @@ S: Wantage, New Jersey 07461 
S: USA

S: USA





N: Harald Hoyer

N: Harald Hoyer

E: harald.hoyer@parzelle.de

E: harald@redhat.com

W: http://parzelle.de/

W: http://www.harald-hoyer.de

D: ip_masq_quake

D: ip_masq_quake

D: md boot support

D: md boot support

S: Hohe Strasse 30

S: Am Strand 5

S: D-70176 Stuttgart

S: D-19063 Schwerin

S: Germany

S: Germany





N: Jan Hubicka

N: Jan Hubicka

Documentation/DocBook/uio-howto.tmpl

+1 −1
Original line number Original line Diff line number Diff line
@@ -984,7 +984,7 @@ int main() 
		return errno;

		return errno;

	}

	}

	configfd = open("/sys/class/uio/uio0/device/config", O_RDWR);

	configfd = open("/sys/class/uio/uio0/device/config", O_RDWR);

	if (uiofd < 0) {

	if (configfd < 0) {

		perror("config open:");

		perror("config open:");

		return errno;

		return errno;

	}

	}

Documentation/w1/slaves/w1_therm

+10 −3
Original line number Original line Diff line number Diff line
@@ -34,9 +34,16 @@ currently supported. The driver also doesn't support reduced 
precision (which would also reduce the conversion time).

precision (which would also reduce the conversion time).





The module parameter strong_pullup can be set to 0 to disable the

The module parameter strong_pullup can be set to 0 to disable the

strong pullup or 1 to enable.  If enabled the 5V strong pullup will be

strong pullup, 1 to enable autodetection or 2 to force strong pullup.

enabled when the conversion is taking place provided the master driver

In case of autodetection, the driver will use the "READ POWER SUPPLY"

must support the strong pullup (or it falls back to a pullup

command to check if there are pariste powered devices on the bus.

If so, it will activate the master's strong pullup.

In case the detection of parasite devices using this command fails

(seems to be the case with some DS18S20) the strong pullup can

be force-enabled.

If the strong pullup is enabled, the master's strong pullup will be

driven when the conversion is taking place, provided the master driver

does support the strong pullup (or it falls back to a pullup

resistor).  The DS18b20 temperature sensor specification lists a

resistor).  The DS18b20 temperature sensor specification lists a

maximum current draw of 1.5mA and that a 5k pullup resistor is not

maximum current draw of 1.5mA and that a 5k pullup resistor is not

sufficient.  The strong pullup is designed to provide the additional

sufficient.  The strong pullup is designed to provide the additional

MAINTAINERS

+7 −0
Original line number Original line Diff line number Diff line
@@ -5405,6 +5405,13 @@ S: Maintained 
F:	Documentation/scsi/NinjaSCSI.txt

F:	Documentation/scsi/NinjaSCSI.txt

F:	drivers/scsi/nsp32*

F:	drivers/scsi/nsp32*





NTB DRIVER

M:	Jon Mason <jon.mason@intel.com>

S:	Supported

F:	drivers/ntb/

F:	drivers/net/ntb_netdev.c

F:	include/linux/ntb.h



NTFS FILESYSTEM

NTFS FILESYSTEM

M:	Anton Altaparmakov <anton@tuxera.com>

M:	Anton Altaparmakov <anton@tuxera.com>

L:	linux-ntfs-dev@lists.sourceforge.net

L:	linux-ntfs-dev@lists.sourceforge.net

drivers/Kconfig

+2 −0
Original line number Original line Diff line number Diff line
@@ -152,6 +152,8 @@ source "drivers/memory/Kconfig" 




source "drivers/iio/Kconfig"

source "drivers/iio/Kconfig"





source "drivers/ntb/Kconfig"



source "drivers/vme/Kconfig"

source "drivers/vme/Kconfig"





source "drivers/pwm/Kconfig"

source "drivers/pwm/Kconfig"