Commit 708e1689 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: (39 commits)
  Add missing maintainer countries in CREDITS
  Fix bytes <-> kilobytes  typo in Kconfig for ramdisk
  fix a typo in Documentation/pi-futex.txt
  BUG_ON conversion for fs/xfs/
  BUG_ON() conversion in fs/nfsd/
  BUG_ON conversion for fs/reiserfs
  BUG_ON cleanups in arch/i386
  BUG_ON cleanup in drivers/net/tokenring/
  BUG_ON cleanup for drivers/md/
  kerneldoc-typo in led-class.c
  debugfs: spelling fix
  rcutorture: Fix incorrect description of default for nreaders parameter
  parport: Remove space in function calls
  Michal Wronski: update contact info
  Spelling fix: "control" instead of "cotrol"
  reboot parameter in Documentation/kernel-parameters.txt
  Fix copy&waste bug in comment in scripts/kernel-doc
  remove duplicate "until" from kernel/workqueue.c
  ite_gpio fix tabbage
  fix file specification in comments
  ...

Fixed trivial path conflicts due to removed files:
   arch/mips/dec/boot/decstation.c, drivers/char/ite_gpio.c
parents f3c87a89 a8478259

CREDITS

+7 −1
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ E: magrawal@nortelnetworks.com 
D: Basic Interphase 5575 driver with UBR and ABR support.

S: 75 Donald St, Apt 42

S: Weymouth, MA 02188

S: USA



N: Dave Airlie

E: airlied@linux.ie
@@ -202,6 +203,7 @@ S: MS42 
S: Hewlett-Packard

S: 3404 E Harmony Rd

S: Fort Collins, CO 80525

S: USA



N: Arindam Banerji

E: axb@cse.nd.edu
@@ -444,6 +446,7 @@ E: rbradetich@uswest.net 
D: Linux/PA-RISC hacker

S: 1200 Goldenrod Dr.

S: Nampa, Idaho 83686

S: USA



N: Derrick J. Brashear

E: shadow@dementia.org
@@ -633,6 +636,7 @@ E: scole@lanl.gov 
E: elenstev@mesatop.com

D: Various build fixes and kernel documentation.

S: Los Alamos, New Mexico

S: USA



N: Hamish Coleman

E: hamish@zot.apana.org.au
@@ -2009,6 +2013,7 @@ W: http://www.mathematik.uni-stuttgart.de/~floeff 
D: Busmaster driver for HP 10/100 Mbit Network Adapters

S: University of Stuttgart, Germany and

S: Ecole Nationale Superieure des Telecommunications, Paris

S: France



N: Jamie Lokier

E: jamie@shareable.org
@@ -2178,6 +2183,7 @@ S: Hewlett Packard 
S: MS 42

S: 3404 E. Harmony Road

S: Fort Collins, CO 80528

S: USA



N: Torben Mathiasen

E: torben.mathiasen@compaq.com
@@ -3658,7 +3664,7 @@ S: Portland, OR 
S: USA



N: Michal Wronski

E: Michal.Wronski@motorola.com

E: michal.wronski@gmail.com

D: POSIX message queues fs (with K. Benedyczak)

S: Krakow

S: Poland

Documentation/DMA-mapping.txt

+2 −2
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ The query is performed via a call to pci_set_dma_mask(): 


	int pci_set_dma_mask(struct pci_dev *pdev, u64 device_mask);



The query for consistent allocations is performed via a a call to

The query for consistent allocations is performed via a call to

pci_set_consistent_dma_mask():



	int pci_set_consistent_dma_mask(struct pci_dev *pdev, u64 device_mask);

Documentation/DocBook/libata.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -1400,7 +1400,7 @@ and other resources, etc. 
	<listitem>

	<para>

	When it's known that HBA is in ready state but ATA/ATAPI

	device in in unknown state, reset only device.

	device is in unknown state, reset only device.

	</para>

	</listitem>

Documentation/DocBook/usb.tmpl

+2 −3
Original line number Diff line number Diff line
@@ -314,8 +314,7 @@ 
	<emphasis>usbdevfs</emphasis> although it wasn't solving what

	<emphasis>devfs</emphasis> was.

	Every USB device will appear in usbfs, regardless of whether or

	not it has a kernel driver; but only devices with kernel drivers

	show up in devfs.

	not it has a kernel driver.

	</para>



	<sect1>
@@ -741,7 +740,7 @@ usbdev_ioctl (int fd, int ifno, unsigned request, void *param) 
		<title>Synchronous I/O Support</title>



		<para>Synchronous requests involve the kernel blocking

		until until the user mode request completes, either by

		until the user mode request completes, either by

		finishing successfully or by reporting an error.

		In most cases this is the simplest way to use usbfs,

		although as noted above it does prevent performing I/O

Documentation/DocBook/writing_usb_driver.tmpl

+1 −6
Original line number Diff line number Diff line
@@ -224,13 +224,8 @@ static int skel_probe(struct usb_interface *interface, 
     Conversely, when the device is removed from the USB bus, the disconnect

     function is called with the device pointer. The driver needs to clean any

     private data that has been allocated at this time and to shut down any

     pending urbs that are in the USB system. The driver also unregisters

     itself from the devfs subsystem with the call:

     pending urbs that are in the USB system.

  </para>

  <programlisting>

/* remove our devfs node */

devfs_unregister(skel->devfs);

  </programlisting>

  <para>

     Now that the device is plugged into the system and the driver is bound to

     the device, any of the functions in the file_operations structure that

CRA Git | Maintained and supported by SUSTech CRA and CCSE