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

Commit ddfb43f3 authored Sep 22, 2012 by Mark Brown

Merge tag 'v3.6-rc6' into for-3.7

Linux 3.6-rc6 has all our bug fixes.

Conflicts (trivial overlap):
	sound/soc/omap/am3517evm.c

parents 2d6d649a 5698bd75

Documentation/ABI/testing/sysfs-bus-pci

+12 −0

Original line number	Original line	Diff line number	Diff line
	@@ -210,3 +210,15 @@ Users:
	firmware assigned instance number of the PCI		firmware assigned instance number of the PCI
	device that can help in understanding the firmware		device that can help in understanding the firmware
	intended order of the PCI device.		intended order of the PCI device.

			What: /sys/bus/pci/devices/.../d3cold_allowed
			Date: July 2012
			Contact: Huang Ying <ying.huang@intel.com>
			Description:
			d3cold_allowed is bit to control whether the corresponding PCI
			device can be put into D3Cold state. If it is cleared, the
			device will never be put into D3Cold state. If it is set, the
			device may be put into D3Cold state if other requirements are
			satisfied too. Reading this attribute will show the current
			value of d3cold_allowed bit. Writing this attribute will set
			the value of d3cold_allowed bit.

Documentation/feature-removal-schedule.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -579,7 +579,7 @@ Why: KVM tracepoints provide mostly equivalent information in a much more
	----------------------------		----------------------------

	What: at91-mci driver ("CONFIG_MMC_AT91")		What: at91-mci driver ("CONFIG_MMC_AT91")
	When: 3.7		When: 3.8
	Why: There are two mci drivers: at91-mci and atmel-mci. The PDC support		Why: There are two mci drivers: at91-mci and atmel-mci. The PDC support
	was added to atmel-mci as a first step to support more chips.		was added to atmel-mci as a first step to support more chips.
	Then at91-mci was kept only for old IP versions (on at91rm9200 and		Then at91-mci was kept only for old IP versions (on at91rm9200 and

Documentation/i2c/busses/i2c-i801

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -21,6 +21,7 @@ Supported adapters:
	* Intel DH89xxCC (PCH)		* Intel DH89xxCC (PCH)
	* Intel Panther Point (PCH)		* Intel Panther Point (PCH)
	* Intel Lynx Point (PCH)		* Intel Lynx Point (PCH)
			* Intel Lynx Point-LP (PCH)
	Datasheets: Publicly available at the Intel website		Datasheets: Publicly available at the Intel website

	On Intel Patsburg and later chipsets, both the normal host SMBus controller		On Intel Patsburg and later chipsets, both the normal host SMBus controller

MAINTAINERS

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -3388,7 +3388,7 @@ M: "Wolfram Sang (embedded platforms)" <w.sang@pengutronix.de>
	L: linux-i2c@vger.kernel.org		L: linux-i2c@vger.kernel.org
	W: http://i2c.wiki.kernel.org/		W: http://i2c.wiki.kernel.org/
	T: quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/		T: quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/
	T: git git://git.fluff.org/bjdooks/linux.git		T: git git://git.pengutronix.de/git/wsa/linux.git
	S: Maintained		S: Maintained
	F: Documentation/i2c/		F: Documentation/i2c/
	F: drivers/i2c/		F: drivers/i2c/

Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	VERSION = 3		VERSION = 3
	PATCHLEVEL = 6		PATCHLEVEL = 6
	SUBLEVEL = 0		SUBLEVEL = 0
	EXTRAVERSION = -rc4		EXTRAVERSION = -rc6
	NAME = Saber-toothed Squirrel		NAME = Saber-toothed Squirrel

	# DOCUMENTATION		# DOCUMENTATION