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

Commit 5ffdcd94 authored by Grant Likely's avatar Grant Likely
Browse files

Merge commit 'v2.6.35-rc6' into spi/test

parents cf40f082 b37fa16e
Loading
Loading
Loading
Loading
+4 −2
Original line number Original line Diff line number Diff line
@@ -32,8 +32,6 @@ DocBook/
	- directory with DocBook templates etc. for kernel documentation.
	- directory with DocBook templates etc. for kernel documentation.
HOWTO
HOWTO
	- the process and procedures of how to do Linux kernel development.
	- the process and procedures of how to do Linux kernel development.
IO-mapping.txt
	- how to access I/O mapped memory from within device drivers.
IPMI.txt
IPMI.txt
	- info on Linux Intelligent Platform Management Interface (IPMI) Driver.
	- info on Linux Intelligent Platform Management Interface (IPMI) Driver.
IRQ-affinity.txt
IRQ-affinity.txt
@@ -84,6 +82,8 @@ blockdev/
	- info on block devices & drivers
	- info on block devices & drivers
btmrvl.txt
btmrvl.txt
	- info on Marvell Bluetooth driver usage.
	- info on Marvell Bluetooth driver usage.
bus-virt-phys-mapping.txt
	- how to access I/O mapped memory from within device drivers.
cachetlb.txt
cachetlb.txt
	- describes the cache/TLB flushing interfaces Linux uses.
	- describes the cache/TLB flushing interfaces Linux uses.
cdrom/
cdrom/
@@ -168,6 +168,8 @@ initrd.txt
	- how to use the RAM disk as an initial/temporary root filesystem.
	- how to use the RAM disk as an initial/temporary root filesystem.
input/
input/
	- info on Linux input device support.
	- info on Linux input device support.
io-mapping.txt
	- description of io_mapping functions in linux/io-mapping.h
io_ordering.txt
io_ordering.txt
	- info on ordering I/O writes to memory-mapped addresses.
	- info on ordering I/O writes to memory-mapped addresses.
ioctl/
ioctl/
+4 −2
Original line number Original line Diff line number Diff line
@@ -1265,7 +1265,7 @@ and is between 256 and 4096 characters. It is defined in the file
			If there are multiple matching configurations changing
			If there are multiple matching configurations changing
			the same attribute, the last one is used.
			the same attribute, the last one is used.


	lmb=debug	[KNL] Enable lmb debug messages.
	memblock=debug	[KNL] Enable memblock debug messages.


	load_ramdisk=	[RAM] List of ramdisks to load from floppy
	load_ramdisk=	[RAM] List of ramdisks to load from floppy
			See Documentation/blockdev/ramdisk.txt.
			See Documentation/blockdev/ramdisk.txt.
@@ -2048,7 +2048,9 @@ and is between 256 and 4096 characters. It is defined in the file
			WARNING: Forcing ASPM on may cause system lockups.
			WARNING: Forcing ASPM on may cause system lockups.


	pcie_pme=	[PCIE,PM] Native PCIe PME signaling options:
	pcie_pme=	[PCIE,PM] Native PCIe PME signaling options:
		off	Do not use native PCIe PME signaling.
			Format: {auto|force}[,nomsi]
		auto	Use native PCIe PME signaling if the BIOS allows the
			kernel to control PCIe config registers of root ports.
		force	Use native PCIe PME signaling even if the BIOS refuses
		force	Use native PCIe PME signaling even if the BIOS refuses
			to allow the kernel to control the relevant PCIe config
			to allow the kernel to control the relevant PCIe config
			registers.
			registers.
+1 −0
Original line number Original line Diff line number Diff line
@@ -82,3 +82,4 @@ tuner=81 - Partsnic (Daewoo) PTI-5NF05
tuner=82 - Philips CU1216L
tuner=82 - Philips CU1216L
tuner=83 - NXP TDA18271
tuner=83 - NXP TDA18271
tuner=84 - Sony BTF-Pxn01Z
tuner=84 - Sony BTF-Pxn01Z
tuner=85 - Philips FQ1236 MK5
+5 −0
Original line number Original line Diff line number Diff line
@@ -125,6 +125,11 @@ ibmasr:
nowayout: Watchdog cannot be stopped once started
nowayout: Watchdog cannot be stopped once started
	(default=kernel config parameter)
	(default=kernel config parameter)
-------------------------------------------------
-------------------------------------------------
imx2_wdt:
timeout: Watchdog timeout in seconds (default 60 s)
nowayout: Watchdog cannot be stopped once started
	(default=kernel config parameter)
-------------------------------------------------
indydog:
indydog:
nowayout: Watchdog cannot be stopped once started
nowayout: Watchdog cannot be stopped once started
	(default=kernel config parameter)
	(default=kernel config parameter)
Loading