Commit eda485f0 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files

Merge remote-tracking branch 'pci/pci/gavin-window-alignment' into next 



Merge Gavin patches from the PCI tree as subsequent powerpc
patches are going to depend on them

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parents 6b5e7229 9a5d5bd8

Documentation/ABI/testing/sysfs-bus-pci

+12 −0
Original line number Diff line number Diff line
@@ -210,3 +210,15 @@ Users: 
		firmware assigned instance number of the PCI

		device that can help in understanding the firmware

		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 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")

When:	3.7

When:	3.8

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.

	Then at91-mci was kept only for old IP versions (on at91rm9200 and

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 3

PATCHLEVEL = 6

SUBLEVEL = 0

EXTRAVERSION = -rc4

EXTRAVERSION = -rc5

NAME = Saber-toothed Squirrel



# *DOCUMENTATION*

arch/arm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ config ARM 
	select HAVE_DMA_API_DEBUG

	select HAVE_IDE if PCI || ISA || PCMCIA

	select HAVE_DMA_ATTRS

	select HAVE_DMA_CONTIGUOUS if (CPU_V6 || CPU_V6K || CPU_V7)

	select HAVE_DMA_CONTIGUOUS if MMU

	select HAVE_MEMBLOCK

	select RTC_LIB

	select SYS_SUPPORTS_APM_EMULATION

arch/arm/boot/dts/at91sam9g25ek.dts

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
	compatible = "atmel,at91sam9g25ek", "atmel,at91sam9x5ek", "atmel,at91sam9x5", "atmel,at91sam9";



	chosen {

		bootargs = "128M console=ttyS0,115200 root=/dev/mtdblock1 rw rootfstype=ubifs ubi.mtd=1 root=ubi0:rootfs";

		bootargs = "console=ttyS0,115200 root=/dev/mtdblock1 rw rootfstype=ubifs ubi.mtd=1 root=ubi0:rootfs";

	};



	ahb {