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

Commit a47fd3f5 authored by Steve French's avatar Steve French
Browse files

Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git 

french@hera:~/linux-2.6(0)$ cg-update
l
`/pub/scm/linux/kernel/git/torvalds/linux-2.6.git/refs/heads/master' ->
`.git/refs/heads/origin'
cp: cannot create link `.git/objects/info/packs': File exists
progress: 213 objects, 646653 bytes, 77% done
`/pub/scm/linux/kernel/git/torvalds/linux-2.6.git/objects/info/packs' ->
`.git/objects/info/packs'
progress: 983 objects, 2805763 bytes, 100% done
cg-pull: objects pull failed
parents ef6724e3 86b37860

CREDITS

+2 −2
Original line number Diff line number Diff line
@@ -2380,8 +2380,8 @@ E: tmolina@cablespeed.com 
D: bug fixes, documentation, minor hackery



N: James Morris

E: jmorris@redhat.com

W: http://www.intercode.com.au/jmorris/

E: jmorris@namei.org

W: http://namei.org/

D: Netfilter, Linux Security Modules (LSM), SELinux, IPSec,

D: Crypto API, general networking, miscellaneous.

S: PO Box 707

Documentation/dontdiff

+1 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ logo_*.c 
logo_*_clut224.c

logo_*_mono.c

lxdialog

mach-types

mach-types.h

make_times_h

map

Documentation/kprobes.txt

0 → 100644
+588 −0

File added.

Preview size limit exceeded, changes collapsed.

Documentation/usb/usbmon.txt

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ Here is the list of words, from left to right: 
- URB Status. This field makes no sense for submissions, but is present

  to help scripts with parsing. In error case, it contains the error code.

  In case of a setup packet, it contains a Setup Tag. If scripts read a number

  in this field, the proceed to read Data Length. Otherwise, they read

  in this field, they proceed to read Data Length. Otherwise, they read

  the setup packet before reading the Data Length.

- Setup packet, if present, consists of 5 words: one of each for bmRequestType,

  bRequest, wValue, wIndex, wLength, as specified by the USB Specification 2.0.

Documentation/video4linux/bttv/Insmod-options

+3 −0
Original line number Diff line number Diff line
@@ -44,6 +44,9 @@ bttv.o 
				push used by bttv.  bttv will disable overlay

				by default on this hardware to avoid crashes.

				With this insmod option you can override this.

		no_overlay=1	Disable overlay. It should be used by broken

				hardware that doesn't support PCI2PCI direct

				transfers.

		automute=0/1	Automatically mutes the sound if there is

				no TV signal, on by default.  You might try

				to disable this if you have bad input signal