Commit 9a9136e2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 

* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (25 commits)
  sound: convert "sound" subdirectory to UTF-8
  MAINTAINERS: Add cxacru website/mailing list
  include files: convert "include" subdirectory to UTF-8
  general: convert "kernel" subdirectory to UTF-8
  documentation: convert the Documentation directory to UTF-8
  Convert the toplevel files CREDITS and MAINTAINERS to UTF-8.
  remove broken URLs from net drivers' output
  Magic number prefix consistency change to Documentation/magic-number.txt
  trivial: s/i_sem /i_mutex/
  fix file specification in comments
  drivers/base/platform.c: fix small typo in doc
  misc doc and kconfig typos
  Remove obsolete fat_cvf help text
  Fix occurrences of "the the "
  Fix minor typoes in kernel/module.c
  Kconfig: Remove reference to external mqueue library
  Kconfig: A couple of grammatical fixes in arch/i386/Kconfig
  Correct comments in genrtc.c to refer to correct /proc file.
  Fix more "deprecated" spellos.
  Fix "deprecated" typoes.
  ...

Fix trivial comment conflict in kernel/relay.c.
parents 3960208f 7bb2acb7

CREDITS

+22 −22
Original line number Diff line number Diff line
@@ -380,7 +380,7 @@ S: FutureTV Labs Ltd 
S: Brunswick House, 61-69 Newmarket Rd, Cambridge CB5 8EG

S: United Kingdom



N: Thomas Bogendrfer

N: Thomas Bogendörfer

E: tsbogend@alpha.franken.de

D: PCnet32 driver, SONIC driver, JAZZ_ESP driver

D: newport abscon driver, g364 framebuffer driver
@@ -400,7 +400,7 @@ W: http://math-www.uni-paderborn.de/~axel/ 
D: Configuration help text support

D: Linux CD and Support Giveaway List



N: Erik Inge Bols

N: Erik Inge Bolsø

E: knan@mo.himolde.no

D: Misc kernel hacks
@@ -428,7 +428,7 @@ D: Various fixes (mostly networking) 
S: Montreal, Quebec

S: Canada



N: Zoltn Bszrmnyi

N: Zoltán Böszörményi

E: zboszor@mail.externet.hu

D: MTRR emulation with Cyrix style ARR registers, Athlon MTRR support
@@ -1029,11 +1029,11 @@ D: Future Domain TMC-16x0 SCSI driver (author) 
D: APM driver (early port)

D: DRM drivers (author of several)



N: Jnos Farkas

N: János Farkas

E: chexum@shadow.banki.hu

D: romfs, various (mostly networking) fixes

P: 1024/F81FB2E1 41 B7 E4 E6 3E D4 A6 71  6D 9C F3 9F F2 BF DF 6E

S: Madarsz Viktor utca 25

S: Madarász Viktor utca 25

S: 1131 Budapest

S: Hungary
@@ -1044,10 +1044,10 @@ D: UDF filesystem 
S: (ask for current address)

S: USA



N: Jrgen Fischer

E: fischer@norbit.de (=?iso-8859-1?q?J=FCrgen?= Fischer)

N: Jürgen Fischer

E: fischer@norbit.de

D: Author of Adaptec AHA-152x SCSI driver

S: Schulstrae 18

S: Schulstraße 18

S: 26506 Norden

S: Germany
@@ -1113,7 +1113,7 @@ E: fuganti@netbank.com.br 
D: random kernel hacker, ZF MachZ Watchdog driver

S: Conectiva S.A.

S: R. Tocantins, 89 - Cristo Rei

S: 80050-430 - Curitiba - Paran

S: 80050-430 - Curitiba - Paraná

S: Brazil



N: Kumar Gala
@@ -1258,12 +1258,12 @@ S: 44 St. Joseph Street, Suite 506 
S: Toronto, Ontario, M4Y 2W4

S: Canada



N: Richard Gnther

N: Richard Günther

E: rguenth@tat.physik.uni-tuebingen.de

W: http://www.tat.physik.uni-tuebingen.de/~rguenth

P: 2048/2E829319 2F 83 FC 93 E9 E4 19 E2  93 7A 32 42 45 37 23 57

D: binfmt_misc

S: 72074 Tbingen

S: 72074 Tübingen

S: Germany



N: Justin Guyett
@@ -1287,7 +1287,7 @@ N: Bruno Haible 
E: haible@ma2s2.mathematik.uni-karlsruhe.de

D: SysV FS, shm swapping, memory management fixes

S: 17 rue Danton

S: F - 94270 Le Kremlin-Bictre

S: F - 94270 Le Kremlin-Bicêtre

S: France



N: Greg Hankins
@@ -1701,7 +1701,7 @@ S: Czech Republic 
N: Jakob Kemi

E: jakob.kemi@telia.com

D: V4L W9966 Webcam driver

S: Forsbyvgen 33

S: Forsbyvägen 33

S: 74143 Knivsta

S: Sweden
@@ -2065,7 +2065,7 @@ D: misc. kernel hacking and debugging 
S: Cambridge, MA 02139

S: USA



N: Martin von Lwis

N: Martin von Löwis

E: loewis@informatik.hu-berlin.de

D: script binary format

D: NTFS driver
@@ -2142,7 +2142,7 @@ S: PO BOX 220, HFX. CENTRAL 
S: Halifax, Nova Scotia

S: Canada B3J 3C8



N: Kai Mkisara

N: Kai Mäkisara

E: Kai.Makisara@kolumbus.fi

D: SCSI Tape Driver
@@ -2785,10 +2785,10 @@ N: Juan Quintela 
E: quintela@fi.udc.es

D: Memory Management hacking

S: LFCIA

S: Departamento de Computacin

S: Universidade da Corua

S: Departamento de Computación

S: Universidade da Coruña

S: E-15071

S: A Corua

S: A Coruña

S: Spain



N: Augusto Cesar Radtke
@@ -2939,7 +2939,7 @@ E: aris@cathedrallabs.org 
D: Support for EtherExpress 10 ISA (i82595) in eepro driver

D: User level driver support for input

S: R. Jose Serrato, 130 - Santa Candida

S: 82640-320 - Curitiba - Paran

S: 82640-320 - Curitiba - Paraná

S: Brazil



N: Alessandro Rubini
@@ -3345,15 +3345,15 @@ P: 1024D/D0FE7AFB B24A 65C9 1D71 2AC2 DE87 CA26 189B 9946 D0FE 7AFB 
D: rcutorture maintainer

D: lock annotations, finding and fixing lock bugs



N: Winfried Trmper

N: Winfried Trümper

E: winni@xpilot.org

W: http://www.shop.de/~winni/

D: German HOWTO, Crash-Kurs Linux (German, 100 comprehensive pages)

D: CD-Writing HOWTO, various mini-HOWTOs

D: One-week tutorials on Linux twice a year (free of charge)

D: Linux-Workshop Kln (aka LUG Cologne, Germany), Installfests

D: Linux-Workshop Köln (aka LUG Cologne, Germany), Installfests

S: Tacitusstr. 6

S: D-50968 Kln

S: D-50968 Köln



N: Tsu-Sheng Tsao

E: tsusheng@scf.usc.edu

Documentation/ABI/removed/devfs

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ Description: 
	races, contains a naming policy within the kernel that is

	against the LSB, and can be replaced by using udev.

	The files fs/devfs/*, include/linux/devfs_fs*.h were removed,

	along with the the assorted devfs function calls throughout the

	along with the assorted devfs function calls throughout the

	kernel tree.



Users:

Documentation/DocBook/kernel-api.tmpl

+4 −0
Original line number Diff line number Diff line
@@ -84,6 +84,10 @@ X!Iinclude/linux/kobject.h 
!Ekernel/rcupdate.c

     </sect1>



     <sect1><title>Device Resource Management</title>

!Edrivers/base/devres.c

     </sect1>



  </chapter>



  <chapter id="adt">

Documentation/MSI-HOWTO.txt

+3 −3
Original line number Diff line number Diff line
@@ -480,8 +480,8 @@ The PCI stack provides 3 possible levels of MSI disabling: 


6.1. Disabling MSI on a single device



Under some circumstances, it might be required to disable MSI on a

single device, It may be achived by either not calling pci_enable_msi()

Under some circumstances it might be required to disable MSI on a

single device.  This may be achieved by either not calling pci_enable_msi()

or all, or setting the pci_dev->no_msi flag before (most of the time

in a quirk).
@@ -492,7 +492,7 @@ being able to route MSI between busses. In this case, MSI have to be 
disabled on all devices behind this bridge. It is achieves by setting

the PCI_BUS_FLAGS_NO_MSI flag in the pci_bus->bus_flags of the bridge

subordinate bus. There is no need to set the same flag on bridges that

are below the broken brigde. When pci_enable_msi() is called to enable

are below the broken bridge. When pci_enable_msi() is called to enable

MSI on a device, pci_msi_supported() takes care of checking the NO_MSI

flag in all parent busses of the device.

Documentation/arm/Interrupts

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ So, what's changed? 


3. set_GPIO_IRQ_edge() is obsolete, and should be replaced by set_irq_type.



4. Direct access to SA1111 INTPOL is depreciated.  Use set_irq_type instead.

4. Direct access to SA1111 INTPOL is deprecated.  Use set_irq_type instead.



5. A handler is expected to perform any necessary acknowledgement of the

   parent IRQ via the correct chip specific function.  For instance, if

CRA Git | Maintained and supported by SUSTech CRA and CCSE