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

Commit 9dcdbf7a authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into perf/core 



Merge reason: Pick up the latest perf fixes.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents cc5edb0e cd5b8f87

Documentation/00-INDEX

+4 −2
Original line number Diff line number Diff line
@@ -32,8 +32,6 @@ DocBook/ 
	- directory with DocBook templates etc. for kernel documentation.

HOWTO

	- 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

	- info on Linux Intelligent Platform Management Interface (IPMI) Driver.

IRQ-affinity.txt
@@ -84,6 +82,8 @@ blockdev/ 
	- info on block devices & drivers

btmrvl.txt

	- info on Marvell Bluetooth driver usage.

bus-virt-phys-mapping.txt

	- how to access I/O mapped memory from within device drivers.

cachetlb.txt

	- describes the cache/TLB flushing interfaces Linux uses.

cdrom/
@@ -168,6 +168,8 @@ initrd.txt 
	- how to use the RAM disk as an initial/temporary root filesystem.

input/

	- info on Linux input device support.

io-mapping.txt

	- description of io_mapping functions in linux/io-mapping.h

io_ordering.txt

	- info on ordering I/O writes to memory-mapped addresses.

ioctl/

Documentation/kernel-parameters.txt

+1 −1
Original line number 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

			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

			See Documentation/blockdev/ramdisk.txt.

Documentation/video4linux/CARDLIST.tuner

+1 −0
Original line number Diff line number Diff line
@@ -82,3 +82,4 @@ tuner=81 - Partsnic (Daewoo) PTI-5NF05 
tuner=82 - Philips CU1216L

tuner=83 - NXP TDA18271

tuner=84 - Sony BTF-Pxn01Z

tuner=85 - Philips FQ1236 MK5

MAINTAINERS

+4 −1
Original line number Diff line number Diff line
@@ -2121,7 +2121,9 @@ M: Mauro Carvalho Chehab <mchehab@redhat.com> 
L:	linux-edac@vger.kernel.org

W:	bluesmoke.sourceforge.net

S:	Maintained

F:	drivers/edac/i7core_edac.c linux/edac_mce.h drivers/edac/edac_mce.c

F:	drivers/edac/i7core_edac.c

F:	drivers/edac/edac_mce.c

F:	include/linux/edac_mce.h



EDAC-I82975X

M:	Ranganathan Desikan <ravi@jetztechnologies.com>
@@ -5327,6 +5329,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git 
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git

S:	Maintained

F:	arch/sparc/

F:	drivers/sbus



SPARC SERIAL DRIVERS

M:	"David S. Miller" <davem@davemloft.net>