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

Commit 5b4d4771 authored by Steve French's avatar Steve French
Browse files

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

parents 55f78e17 baadac8b

Documentation/lguest/lguest.c

+5 −2
Original line number Diff line number Diff line
@@ -486,9 +486,12 @@ static void concat(char *dst, char *args[]) 
	unsigned int i, len = 0;



	for (i = 0; args[i]; i++) {

		strcpy(dst+len, args[i]);

		if (i) {

			strcat(dst+len, " ");

		len += strlen(args[i]) + 1;

			len++;

		}

		strcpy(dst+len, args[i]);

		len += strlen(args[i]);

	}

	/* In case it's empty. */

	dst[len] = '\0';

Documentation/pci.txt

+2 −2
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ initialization with a pointer to a structure describing the driver 




The ID table is an array of struct pci_device_id entries ending with an

all-zero entry; use of the macro DECLARE_PCI_DEVICE_TABLE is the preferred

all-zero entry; use of the macro DEFINE_PCI_DEVICE_TABLE is the preferred

method of declaring the table.  Each entry consists of:



	vendor,device	Vendor and device ID to match (or PCI_ANY_ID)
@@ -193,7 +193,7 @@ Tips on when/where to use the above attributes: 
	o Do not mark the struct pci_driver.



	o The ID table array should be marked __devinitconst; this is done

	  automatically if the table is declared with DECLARE_PCI_DEVICE_TABLE().

	  automatically if the table is declared with DEFINE_PCI_DEVICE_TABLE().



	o The probe() and remove() functions should be marked __devinit

	  and __devexit respectively.  All initialization functions

Documentation/scheduler/sched-stats.txt

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ of idleness (idle, busy, and newly idle): 


/proc/<pid>/schedstat

----------------

schedstats also adds a new /proc/<pid/schedstat file to include some of

schedstats also adds a new /proc/<pid>/schedstat file to include some of

the same information on a per-process level.  There are three fields in

this file correlating for that process to:

     1) time spent on the cpu

Documentation/usb/usb-help.txt

+3 −5
Original line number Diff line number Diff line 
usb-help.txt

2000-July-12

2008-Mar-7



For USB help other than the readme files that are located in

Documentation/usb/*, see the following:
@@ -11,8 +11,6 @@ Linux USB Guide: http://linux-usb.sourceforge.net 
Linux-USB device overview (working devices and drivers):

                    http://www.qbik.ch/usb/devices/



The Linux-USB mailing lists are:

  linux-usb-users@lists.sourceforge.net   for general user help

  linux-usb-devel@lists.sourceforge.net   for developer discussions

The Linux-USB mailing list is at linux-usb@vger.kernel.org



###

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -2156,7 +2156,7 @@ L: netdev@vger.kernel.org 
S:	Maintained



IPATH DRIVER:

P:	Arthur Jones

P:	Ralph Campbell

M:	infinipath@qlogic.com

L:	general@lists.openfabrics.org

T:	git git://git.qlogic.com/ipath-linux-2.6