Commit 4c1ac1b4 authored by David Howells's avatar David Howells Committed by David Howells
Browse files

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



Conflicts:

	drivers/infiniband/core/iwcm.c
	drivers/net/chelsio/cxgb2.c
	drivers/net/wireless/bcm43xx/bcm43xx_main.c
	drivers/net/wireless/prism54/islpci_eth.c
	drivers/usb/core/hub.h
	drivers/usb/input/hid-core.c
	net/core/netpoll.c

Fix up merge failures with Linus's head and fix new compilation failures.

Signed-Off-By: default avatarDavid Howells <dhowells@redhat.com>
parents c4028958 d916faac

CREDITS

+3 −0
Original line number Diff line number Diff line
@@ -2598,6 +2598,9 @@ S: Ucitelska 1576 
S: Prague 8

S: 182 00 Czech Republic



N: Rick Payne

D: RFC2385 Support for TCP



N: Barak A. Pearlmutter

E: bap@cs.unm.edu

W: http://www.cs.unm.edu/~bap/

Documentation/00-INDEX

+0 −2
Original line number Diff line number Diff line
@@ -104,8 +104,6 @@ firmware_class/ 
	- request_firmware() hotplug interface info.

floppy.txt

	- notes and driver options for the floppy disk driver.

ftape.txt

	- notes about the floppy tape device driver.

hayes-esp.txt

	- info on using the Hayes ESP serial driver.

highuid.txt

Documentation/Changes

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ udev 
----

udev is a userspace application for populating /dev dynamically with

only entries for devices actually present.  udev replaces the basic

functionality of devfs, while allowing persistant device naming for

functionality of devfs, while allowing persistent device naming for

devices.



FUSE

Documentation/DMA-API.txt

+1 −1
Original line number Diff line number Diff line
@@ -489,7 +489,7 @@ size is the size of the area (must be multiples of PAGE_SIZE). 
flags can be or'd together and are



DMA_MEMORY_MAP - request that the memory returned from

dma_alloc_coherent() be directly writeable.

dma_alloc_coherent() be directly writable.



DMA_MEMORY_IO - request that the memory returned from

dma_alloc_coherent() be addressable using read/write/memcpy_toio etc.

Documentation/DMA-ISA-LPC.txt

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ lock. 


Once the DMA transfer is finished (or timed out) you should disable

the channel again. You should also check get_dma_residue() to make

sure that all data has been transfered.

sure that all data has been transferred.



Example:

CRA Git | Maintained and supported by SUSTech CRA and CCSE