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

Commit 5501972e authored by Jaroslav Kysela's avatar Jaroslav Kysela
Browse files

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

parents 9d2f928d e952f31b

.gitignore

+2 −0
Original line number Diff line number Diff line
@@ -30,3 +30,5 @@ include/linux/autoconf.h 
include/linux/compile.h

include/linux/version.h



# stgit generated dirs

patches-*

CREDITS

+2 −0
Original line number Diff line number Diff line
@@ -2813,6 +2813,8 @@ E: luca.risolia@studio.unibo.it 
P: 1024D/FCE635A4 88E8 F32F 7244 68BA 3958  5D40 99DA 5D2A FCE6 35A4

D: V4L driver for W996[87]CF JPEG USB Dual Mode Camera Chips

D: V4L2 driver for SN9C10x PC Camera Controllers

D: V4L2 driver for ET61X151 and ET61X251 PC Camera Controllers

D: V4L2 driver for ZC0301 Image Processor and Control Chip

S: Via Liberta' 41/A

S: Osio Sotto, 24046, Bergamo

S: Italy

Documentation/Changes

+0 −18
Original line number Diff line number Diff line
@@ -15,24 +15,6 @@ and therefore owes credit to the same people as that file (Jared Mauch, 
Axel Boldt, Alessandro Sigala, and countless other users all over the

'net).



The latest revision of this document, in various formats, can always

be found at <http://cyberbuzz.gatech.edu/kaboom/linux/Changes-2.4/>.



Feel free to translate this document.  If you do so, please send me a

URL to your translation for inclusion in future revisions of this

document.



Smotrite file <http://oblom.rnc.ru/linux/kernel/Changes.ru>, yavlyaushisya

russkim perevodom dannogo documenta.



Visite <http://www2.adi.uam.es/~ender/tecnico/> para obtener la traducción

al español de este documento en varios formatos.



Eine deutsche Version dieser Datei finden Sie unter

<http://www.stefan-winter.de/Changes-2.4.0.txt>.



Chris Ricker (kaboom@gatech.edu or chris.ricker@genetics.utah.edu).



Current Minimal Requirements

============================

Documentation/connector/connector.txt

+3 −2
Original line number Diff line number Diff line
@@ -69,10 +69,11 @@ Unregisters new callback with connector core. 


struct cb_id *id 		- unique connector's user identifier.



void cn_netlink_send(struct cn_msg *msg, u32 __groups, int gfp_mask);

int cn_netlink_send(struct cn_msg *msg, u32 __groups, int gfp_mask);



Sends message to the specified groups.  It can be safely called from

any context, but may silently fail under strong memory pressure.

softirq context, but may silently fail under strong memory pressure.

If there are no listeners for given group -ESRCH can be returned.



struct cn_msg *			- message header(with attached data).

u32 __group			- destination group.

Documentation/dvb/avermedia.txt

+3 −7
Original line number Diff line number Diff line 


HOWTO: Get An Avermedia DVB-T working under Linux

	   ______________________________________________
@@ -137,11 +136,8 @@ Getting the card going 
   To  power  up  the  card,  load  the  following modules in the

   following order:



     * insmod dvb-core.o

     * modprobe bttv.o

     * insmod bt878.o

     * insmod dvb-bt8xx.o

     * insmod sp887x.o

     * modprobe bttv (normally loaded automatically)

     * modprobe dvb-bt8xx (or place dvb-bt8xx in /etc/modules)



   Insertion  of  these  modules  into  the  running  kernel will

   activate the appropriate DVB device nodes. It is then possible
@@ -302,4 +298,4 @@ Further Update 
   Many  thanks to Nigel Pearson for the updates to this document

   since the recent revision of the driver.



   January 29th 2004
 
   February 14th 2006