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

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

Merge branch 'master' of... 

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into common/serial-rework

Conflicts:
	arch/sh/kernel/cpu/sh2/setup-sh7619.c
	arch/sh/kernel/cpu/sh2a/setup-mxg.c
	arch/sh/kernel/cpu/sh2a/setup-sh7201.c
	arch/sh/kernel/cpu/sh2a/setup-sh7203.c
	arch/sh/kernel/cpu/sh2a/setup-sh7206.c
	arch/sh/kernel/cpu/sh3/setup-sh7705.c
	arch/sh/kernel/cpu/sh3/setup-sh770x.c
	arch/sh/kernel/cpu/sh3/setup-sh7710.c
	arch/sh/kernel/cpu/sh3/setup-sh7720.c
	arch/sh/kernel/cpu/sh4/setup-sh4-202.c
	arch/sh/kernel/cpu/sh4/setup-sh7750.c
	arch/sh/kernel/cpu/sh4/setup-sh7760.c
	arch/sh/kernel/cpu/sh4a/setup-sh7343.c
	arch/sh/kernel/cpu/sh4a/setup-sh7366.c
	arch/sh/kernel/cpu/sh4a/setup-sh7722.c
	arch/sh/kernel/cpu/sh4a/setup-sh7723.c
	arch/sh/kernel/cpu/sh4a/setup-sh7724.c
	arch/sh/kernel/cpu/sh4a/setup-sh7763.c
	arch/sh/kernel/cpu/sh4a/setup-sh7770.c
	arch/sh/kernel/cpu/sh4a/setup-sh7780.c
	arch/sh/kernel/cpu/sh4a/setup-sh7785.c
	arch/sh/kernel/cpu/sh4a/setup-sh7786.c
	arch/sh/kernel/cpu/sh4a/setup-shx3.c
	arch/sh/kernel/cpu/sh5/setup-sh5.c
	drivers/serial/sh-sci.c
	drivers/serial/sh-sci.h
	include/linux/serial_sci.h
parents f8e53553 4162cf64

.gitignore

+16 −12
Original line number Diff line number Diff line
@@ -22,35 +22,39 @@ 
*.lst

*.symtypes

*.order

modules.builtin

*.elf

*.bin

*.gz

*.bz2

*.lzma

*.lzo

*.patch

*.gcno



#

# Top-level generic files

#

tags

TAGS

vmlinux

System.map

Module.markers

Module.symvers

/tags

/TAGS

/linux

/vmlinux

/vmlinuz

/System.map

/Module.markers

/Module.symvers



#

# git files that we don't want to ignore even it they are dot-files

#

!.gitignore

!.mailmap



#

# Generated include files

#

include/asm

include/asm-*/asm-offsets.h

include/config

include/linux/autoconf.h

include/linux/compile.h

include/linux/version.h

include/linux/utsrelease.h

include/linux/bounds.h

include/generated



# stgit generated dirs

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -105,3 +105,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

+12 −8
Original line number Diff line number Diff line
@@ -1856,7 +1856,7 @@ E: rfkoenig@immd4.informatik.uni-erlangen.de 
D: The Linux Support Team Erlangen



N: Andreas Koensgen

E: ajk@iehk.rwth-aachen.de

E: ajk@comnets.uni-bremen.de

D: 6pack driver for AX.25



N: Harald Koerfgen
@@ -2006,6 +2006,9 @@ E: paul@laufernet.com 
D: Soundblaster driver fixes, ISAPnP quirk

S: California, USA



N: Jonathan Layes

D: ARPD support



N: Tom Lees

E: tom@lpsg.demon.co.uk

W: http://www.lpsg.demon.co.uk/
@@ -2362,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
@@ -2797,7 +2798,7 @@ D: Starter of Linux1394 effort 
S: ask per mail for current address



N: Nicolas Pitre

E: nico@cam.org

E: nico@fluxnic.net

D: StrongARM SA1100 support integrator & hacker

D: Xscale PXA architecture

D: unified SMC 91C9x/91C11x ethernet driver (smc91x)
@@ -3551,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
@@ -3802,6 +3803,9 @@ S: van Bronckhorststraat 12 
S: 2612 XV Delft

S: The Netherlands



N: Thomas Woller

D: CS461x Cirrus Logic sound driver



N: David Woodhouse

E: dwmw2@infradead.org

D: JFFS2 file system, Memory Technology Device subsystem,

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

+10 −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
@@ -82,6 +80,10 @@ block/ 
	- info on the Block I/O (BIO) layer.

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/
@@ -128,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/
@@ -166,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/
@@ -230,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
@@ -248,6 +252,8 @@ numastat.txt 
	- info on how to read Numa policy hit/miss statistics in sysfs.

oops-tracing.txt

	- how to decode those nasty internal kernel error dump messages.

padata.txt

	- An introduction to the "padata" parallel execution API

parisc/

	- directory with info on using Linux on PA-RISC architecture.

parport.txt