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

Commit 28a78e46 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 3.5-rc7 into driver-core-next 



This pulls in the printk fixes to the driver-core-next branch.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 84a1caf1 b0d1f807

Documentation/ABI/stable/sysfs-driver-w1_ds28e04

0 → 100644
+15 −0
Original line number Diff line number Diff line 
What:		/sys/bus/w1/devices/.../pio

Date:		May 2012

Contact:	Markus Franke <franm@hrz.tu-chemnitz.de>

Description:	read/write the contents of the two PIO's of the DS28E04-100

		see Documentation/w1/slaves/w1_ds28e04 for detailed information

Users:		any user space application which wants to communicate with DS28E04-100







What:		/sys/bus/w1/devices/.../eeprom

Date:		May 2012

Contact:	Markus Franke <franm@hrz.tu-chemnitz.de>

Description:	read/write the contents of the EEPROM memory of the DS28E04-100

		see Documentation/w1/slaves/w1_ds28e04 for detailed information

Users:		any user space application which wants to communicate with DS28E04-100

Documentation/stable_kernel_rules.txt

+14 −5
Original line number Diff line number Diff line 
Everything you ever wanted to know about Linux 2.6 -stable releases.

Everything you ever wanted to know about Linux -stable releases.



Rules on what kind of patches are accepted, and which ones are not, into the

"-stable" tree:
@@ -42,10 +42,10 @@ Procedure for submitting patches to the -stable tree: 
   cherry-picked than this can be specified in the following format in

   the sign-off area:



     Cc: <stable@vger.kernel.org> # .32.x: a1f84a3: sched: Check for idle

     Cc: <stable@vger.kernel.org> # .32.x: 1b9508f: sched: Rate-limit newidle

     Cc: <stable@vger.kernel.org> # .32.x: fd21073: sched: Fix affinity logic

     Cc: <stable@vger.kernel.org> # .32.x

     Cc: <stable@vger.kernel.org> # 3.3.x: a1f84a3: sched: Check for idle

     Cc: <stable@vger.kernel.org> # 3.3.x: 1b9508f: sched: Rate-limit newidle

     Cc: <stable@vger.kernel.org> # 3.3.x: fd21073: sched: Fix affinity logic

     Cc: <stable@vger.kernel.org> # 3.3.x

    Signed-off-by: Ingo Molnar <mingo@elte.hu>



   The tag sequence has the meaning of:
@@ -79,6 +79,15 @@ Review cycle: 
   security kernel team, and not go through the normal review cycle.

   Contact the kernel security team for more details on this procedure.



Trees:



 - The queues of patches, for both completed versions and in progress

   versions can be found at:

	http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git

 - The finalized and tagged releases of all stable kernels can be found

   in separate branches per version at:

	http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git





Review committee:

Documentation/w1/slaves/w1_ds28e04

0 → 100644
+36 −0
Original line number Diff line number Diff line 
Kernel driver w1_ds28e04

========================



Supported chips:

  * Maxim DS28E04-100 4096-Bit Addressable 1-Wire EEPROM with PIO



supported family codes:

	W1_FAMILY_DS28E04	0x1C



Author: Markus Franke, <franke.m@sebakmt.com> <franm@hrz.tu-chemnitz.de>



Description

-----------



Support is provided through the sysfs files "eeprom" and "pio". CRC checking

during memory accesses can optionally be enabled/disabled via the device

attribute "crccheck". The strong pull-up can optionally be enabled/disabled

via the module parameter "w1_strong_pullup".



Memory Access



	A read operation on the "eeprom" file reads the given amount of bytes

	from the EEPROM of the DS28E04.



	A write operation on the "eeprom" file writes the given byte sequence

	to the EEPROM of the DS28E04. If CRC checking mode is enabled only

	fully alligned blocks of 32 bytes with valid CRC16 values (in bytes 30

	and 31) are allowed to be written.



PIO Access



	The 2 PIOs of the DS28E04-100 are accessible via the "pio" sysfs file.



	The current status of the PIO's is returned as an 8 bit value. Bit 0/1

	represent the state of PIO_0/PIO_1. Bits 2..7 do not care. The PIO's are

	driven low-active, i.e. the driver delivers/expects low-active values.

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -2709,6 +2709,14 @@ M: Mimi Zohar <zohar@us.ibm.com> 
S:	Supported

F:	security/integrity/evm/



EXTERNAL CONNECTOR SUBSYSTEM (EXTCON)

M:	MyungJoo Ham <myungjoo.ham@samsung.com>

M:	Chanwoo Choi <cw00.choi@samsung.com>

L:	linux-kernel@vger.kernel.org

S:	Maintained

F:	drivers/extcon/

F:	Documentation/extcon/



EXYNOS DP DRIVER

M:	Jingoo Han <jg1.han@samsung.com>

L:	linux-fbdev@vger.kernel.org

drivers/base/bus.c

+0 −1
Original line number Diff line number Diff line
@@ -743,7 +743,6 @@ int bus_add_driver(struct device_driver *drv) 
		}

	}



	kobject_uevent(&priv->kobj, KOBJ_ADD);

	return 0;



out_unregister: