---

yaml --- r: 173871 b: refs/heads/master c: 8d64827 h: refs/heads/master i: 173869: 1382b73 173867: 6ff3f35 173863: 16fef1d 173855: fd0b4c8 v: v3
git-mirror · Dec 5, 2009 · e7420bb · e7420bb
1 parent 9a5ff75
commit e7420bb
Show file tree

Hide file tree

Showing 4,195 changed files with 122,139 additions and 276,371 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6825fbc4cb219f2c98bb7d157915d797cf5cb823
+refs/heads/master: 8d64827172ae680d34d0611a1e865b546e6a5f08
diff --git a/trunk/Documentation/ABI/stable/sysfs-driver-qla2xxx b/trunk/Documentation/ABI/stable/sysfs-driver-qla2xxx
diff --git a/trunk/Documentation/ABI/testing/procfs-diskstats b/trunk/Documentation/ABI/testing/procfs-diskstats
@@ -8,7 +8,7 @@ Description:
 		 1 - major number
 		 2 - minor mumber
 		 3 - device name
-		 4 - reads completed successfully
+		 4 - reads completed succesfully
 		 5 - reads merged
 		 6 - sectors read
 		 7 - time spent reading (ms)

diff --git a/trunk/Documentation/ABI/testing/sysfs-block b/trunk/Documentation/ABI/testing/sysfs-block
@@ -4,7 +4,7 @@ Contact:	Jerome Marchand <jmarchan@redhat.com>
 Description:
 		The /sys/block/<disk>/stat files displays the I/O
 		statistics of disk <disk>. They contain 11 fields:
-		 1 - reads completed successfully
+		 1 - reads completed succesfully
 		 2 - reads merged
 		 3 - sectors read
 		 4 - time spent reading (ms)

diff --git a/trunk/Documentation/DMA-mapping.txt b/trunk/Documentation/DMA-mapping.txt
@@ -214,7 +214,7 @@ most specific mask.
 Here is pseudo-code showing how this might be done:
 
 	#define PLAYBACK_ADDRESS_BITS	DMA_BIT_MASK(32)
-	#define RECORD_ADDRESS_BITS	DMA_BIT_MASK(24)
+	#define RECORD_ADDRESS_BITS	0x00ffffff
 
 	struct my_sound_card *card;
 	struct pci_dev *pdev;
@@ -224,14 +224,14 @@ Here is pseudo-code showing how this might be done:
 		card->playback_enabled = 1;
 	} else {
 		card->playback_enabled = 0;
-		printk(KERN_WARNING "%s: Playback disabled due to DMA limitations.\n",
+		printk(KERN_WARN "%s: Playback disabled due to DMA limitations.\n",
 		       card->name);
 	}
 	if (!pci_set_dma_mask(pdev, RECORD_ADDRESS_BITS)) {
 		card->record_enabled = 1;
 	} else {
 		card->record_enabled = 0;
-		printk(KERN_WARNING "%s: Record disabled due to DMA limitations.\n",
+		printk(KERN_WARN "%s: Record disabled due to DMA limitations.\n",
 		       card->name);
 	}
 

diff --git a/trunk/Documentation/DocBook/genericirq.tmpl b/trunk/Documentation/DocBook/genericirq.tmpl
@@ -417,8 +417,8 @@ desc->chip->end();
       </para>
       <para>
 	To make use of the split implementation, replace the call to
-	__do_IRQ by a call to desc->handle_irq() and associate
-        the appropriate handler function to desc->handle_irq().
+	__do_IRQ by a call to desc->chip->handle_irq() and associate
+        the appropriate handler function to desc->chip->handle_irq().
 	In most cases the generic handler implementations should
 	be sufficient.
      </para>

diff --git a/trunk/Documentation/DocBook/kernel-hacking.tmpl b/trunk/Documentation/DocBook/kernel-hacking.tmpl
@@ -352,7 +352,7 @@ asmlinkage long sys_mycall(int arg)
   </para>
 
   <programlisting>
-if (signal_pending(current))
+if (signal_pending()) 
         return -ERESTARTSYS;
   </programlisting>
 

diff --git a/trunk/Documentation/DocBook/mtdnand.tmpl b/trunk/Documentation/DocBook/mtdnand.tmpl
@@ -362,7 +362,7 @@ module_exit(board_cleanup);
 	<sect1 id="Multiple_chip_control">
 		<title>Multiple chip control</title>
 		<para>
-			The nand driver can control chip arrays. Therefore the
+			The nand driver can control chip arrays. Therefor the
 			board driver must provide an own select_chip function. This
 			function must (de)select the requested chip.
 			The function pointer in the nand_chip structure must

diff --git a/trunk/Documentation/DocBook/tracepoint.tmpl b/trunk/Documentation/DocBook/tracepoint.tmpl
@@ -86,9 +86,4 @@
 !Iinclude/trace/events/irq.h
   </chapter>
 
-  <chapter id="signal">
-   <title>SIGNAL</title>
-!Iinclude/trace/events/signal.h
-  </chapter>
-
 </book>
diff --git a/trunk/Documentation/DocBook/v4l/videodev2.h.xml b/trunk/Documentation/DocBook/v4l/videodev2.h.xml
@@ -492,7 +492,7 @@ struct <link linkend="v4l2-jpegcompression">v4l2_jpegcompression</link> {
                                  * you do, leave them untouched.
                                  * Inluding less markers will make the
                                  * resulting code smaller, but there will
-                                 * be fewer applications which can read it.
+                                 * be fewer aplications which can read it.
                                  * The presence of the APP and COM marker
                                  * is influenced by APP_len and COM_len
                                  * ONLY, not by this property! */

diff --git a/trunk/Documentation/DocBook/writing-an-alsa-driver.tmpl b/trunk/Documentation/DocBook/writing-an-alsa-driver.tmpl
@@ -5318,7 +5318,7 @@ struct _snd_pcm_runtime {
       pages of the given size and map them onto the virtually contiguous
       memory.  The virtual pointer is addressed in runtime-&gt;dma_area.
       The physical address (runtime-&gt;dma_addr) is set to zero,
-      because the buffer is physically non-contiguous.
+      because the buffer is physically non-contigous.
       The physical address table is set up in sgbuf-&gt;table.
       You can get the physical address at a certain offset via
       <function>snd_pcm_sgbuf_get_addr()</function>. 

diff --git a/trunk/Documentation/arm/Samsung-S3C24XX/EB2410ITX.txt b/trunk/Documentation/arm/Samsung-S3C24XX/EB2410ITX.txt
@@ -55,4 +55,4 @@ Maintainers
   This board is maintained by Simtec Electronics.
 
 
-Copyright 2004 Ben Dooks, Simtec Electronics
+(c) 2004 Ben Dooks, Simtec Electronics
diff --git a/trunk/Documentation/arm/Samsung-S3C24XX/GPIO.txt b/trunk/Documentation/arm/Samsung-S3C24XX/GPIO.txt
@@ -134,4 +134,4 @@ Authour
 
 
 Ben Dooks, 03 October 2004
-Copyright 2004 Ben Dooks, Simtec Electronics
+(c) 2004 Ben Dooks, Simtec Electronics
diff --git a/trunk/Documentation/arm/Samsung-S3C24XX/Overview.txt b/trunk/Documentation/arm/Samsung-S3C24XX/Overview.txt
@@ -299,4 +299,4 @@ Port Contributors
 Document Author
 ---------------
 
-Ben Dooks, Copyright 2004-2006 Simtec Electronics
+Ben Dooks, (c) 2004-2005,2006 Simtec Electronics
diff --git a/trunk/Documentation/arm/Samsung-S3C24XX/S3C2412.txt b/trunk/Documentation/arm/Samsung-S3C24XX/S3C2412.txt
@@ -117,4 +117,4 @@ ATA
 Document Author
 ---------------
 
-Ben Dooks, Copyright 2006 Simtec Electronics
+Ben Dooks, (c) 2006 Simtec Electronics
diff --git a/trunk/Documentation/arm/Samsung-S3C24XX/S3C2413.txt b/trunk/Documentation/arm/Samsung-S3C24XX/S3C2413.txt
@@ -18,4 +18,4 @@ Camera Interface
 Document Author
 ---------------
 
-Ben Dooks, Copyright 2006 Simtec Electronics
+Ben Dooks, (c) 2006 Simtec Electronics
diff --git a/trunk/Documentation/arm/Samsung-S3C24XX/Suspend.txt b/trunk/Documentation/arm/Samsung-S3C24XX/Suspend.txt
@@ -133,5 +133,5 @@ Configuration
 Document Author
 ---------------
 
-Ben Dooks, Copyright 2004 Simtec Electronics
+Ben Dooks, (c) 2004 Simtec Electronics
 
diff --git a/trunk/Documentation/arm/Samsung-S3C24XX/USB-Host.txt b/trunk/Documentation/arm/Samsung-S3C24XX/USB-Host.txt
@@ -90,4 +90,4 @@ Platform Data
 Document Author
 ---------------
 
-Ben Dooks, Copyright 2005 Simtec Electronics
+Ben Dooks, (c) 2005 Simtec Electronics
Original file line number	Diff line number	Diff line change
Expand Up		@@ -55,4 +55,4 @@ Maintainers
		This board is maintained by Simtec Electronics.


		Copyright 2004 Ben Dooks, Simtec Electronics
		(c) 2004 Ben Dooks, Simtec Electronics
Original file line number	Diff line number	Diff line change
Expand Up		@@ -134,4 +134,4 @@ Authour


		Ben Dooks, 03 October 2004
		Copyright 2004 Ben Dooks, Simtec Electronics
		(c) 2004 Ben Dooks, Simtec Electronics