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

Commit e8cdfb05 authored by Paul Mundt's avatar Paul Mundt
Browse files

Merge branches 'sh/wdt', 'sh/pci-express-async' and 'common/serial-rework' into sh-latest

parents 8f5585ec 1da09c43 6b620478

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ modules.builtin 
*.gz

*.bz2

*.lzma

*.lzo

*.patch

*.gcno

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ Andy Adamson <andros@citi.umich.edu> 
Arnaud Patard <arnaud.patard@rtp-net.org>

Arnd Bergmann <arnd@arndb.de>

Axel Dyks <xl@xlsigned.net>

Axel Lin <axel.lin@gmail.com>

Ben Gardner <bgardner@wabtec.com>

Ben M Cahill <ben.m.cahill@intel.com>

Björn Steinbrink <B.Steinbrink@gmx.de>
@@ -105,3 +106,4 @@ Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de> 
Uwe Kleine-König <ukl@pengutronix.de>

Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>

Valdis Kletnieks <Valdis.Kletnieks@vt.edu>

Takashi YOSHII <takashi.yoshii.zj@renesas.com>

CREDITS

+6 −8
Original line number Diff line number Diff line
@@ -2365,8 +2365,6 @@ E: acme@redhat.com 
W: http://oops.ghostprotocols.net:81/blog/

P: 1024D/9224DF01 D5DF E3BB E3C8 BCBB F8AD  841A B6AB 4681 9224 DF01

D: IPX, LLC, DCCP, cyc2x, wl3501_cs, net/ hacks

S: R. Brasílio Itiberê, 4270/1010 - Água Verde

S: 80240-060 - Curitiba - Paraná

S: Brazil



N: Karsten Merker
@@ -2813,8 +2811,8 @@ D: CDROM driver "sonycd535" (Sony CDU-535/531) 
N: Stelian Pop

E: stelian@popies.net

P: 1024D/EDBB6147 7B36 0E07 04BC 11DC A7A0  D3F7 7185 9E7A EDBB 6147

D: sonypi, meye drivers, mct_u232 usb serial hacks

S: Paris, France

D: random kernel hacks

S: Paimpont, France



N: Pete Popov

E: pete_popov@yahoo.com
@@ -3554,12 +3552,12 @@ E: cvance@nai.com 
D: portions of the Linux Security Module (LSM) framework and security modules



N: Petr Vandrovec

E: vandrove@vc.cvut.cz

E: petr@vandrovec.name

D: Small contributions to ncpfs

D: Matrox framebuffer driver

S: Chudenicka 8

S: 10200 Prague 10, Hostivar

S: Czech Republic

S: 21513 Conradia Ct

S: Cupertino, CA 95014

S: USA



N: Thibaut Varene

E: T-Bone@parisc-linux.org

Documentation/.gitignore

0 → 100644
+7 −0
Original line number Diff line number Diff line 
filesystems/dnotify_test

laptops/dslm

timers/hpet_example

vm/hugepage-mmap

vm/hugepage-shm

vm/map_hugetlb

Documentation/00-INDEX

+6 −4
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/
@@ -130,8 +130,6 @@ edac.txt 
	- information on EDAC - Error Detection And Correction

eisa.txt

	- info on EISA bus support.

exception.txt

	- how Linux v2.2 handles exceptions without verify_area etc.

fault-injection/

	- dir with docs about the fault injection capabilities infrastructure.

fb/
@@ -168,6 +166,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/
@@ -232,6 +232,8 @@ memory.txt 
	- info on typical Linux memory problems.

mips/

	- directory with info about Linux on MIPS architecture.

mmc/

	- directory with info about the MMC subsystem

mono.txt

	- how to execute Mono-based .NET binaries with the help of BINFMT_MISC.

mutex-design.txt