---

yaml --- r: 174479 b: refs/heads/master c: c9a9c5e h: refs/heads/master i: 174477: be6cd1c 174475: 36b69d9 174471: 1c916c4 174463: 9aae02c v: v3
git-mirror · Nov 18, 2009 · b6ff25b · b6ff25b
1 parent 480a35e
commit b6ff25b
Show file tree

Hide file tree

Showing 5,456 changed files with 152,562 additions and 356,238 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4e5df8069b0e4e36c6b528b3be7da298e6f454cd
+refs/heads/master: c9a9c5e02aedc1a2815877b0268f886d2640b771
diff --git a/trunk/.gitignore b/trunk/.gitignore
@@ -25,7 +25,6 @@
 *.elf
 *.bin
 *.gz
-*.bz2
 *.lzma
 *.patch
 *.gcno

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/device-drivers.tmpl b/trunk/Documentation/DocBook/device-drivers.tmpl
@@ -293,23 +293,10 @@ X!Idrivers/video/console/fonts.c
 
   <chapter id="input_subsystem">
      <title>Input Subsystem</title>
-     <sect1><title>Input core</title>
 !Iinclude/linux/input.h
 !Edrivers/input/input.c
 !Edrivers/input/ff-core.c
 !Edrivers/input/ff-memless.c
-     </sect1>
-     <sect1><title>Polled input devices</title>
-!Iinclude/linux/input-polldev.h
-!Edrivers/input/input-polldev.c
-     </sect1>
-     <sect1><title>Matrix keyboars/keypads</title>
-!Iinclude/linux/input/matrix_keypad.h
-     </sect1>
-     <sect1><title>Sparse keymap support</title>
-!Iinclude/linux/input/sparse-keymap.h
-!Edrivers/input/sparse-keymap.c
-     </sect1>
   </chapter>
 
   <chapter id="spi">

diff --git a/trunk/Documentation/DocBook/dvb/dvbapi.xml b/trunk/Documentation/DocBook/dvb/dvbapi.xml
@@ -29,14 +29,6 @@
 
 <revhistory>
 <!-- Put document revisions here, newest first. -->
-<revision>
-	<revnumber>2.0.2</revnumber>
-	<date>2009-10-25</date>
-	<authorinitials>mcc</authorinitials>
-	<revremark>
-		documents FE_SET_FRONTEND_TUNE_MODE and FE_DISHETWORK_SEND_LEGACY_CMD ioctls.
-	</revremark>
-</revision>
 <revision>
 <revnumber>2.0.1</revnumber>
 <date>2009-09-16</date>
@@ -93,8 +85,3 @@ Added ISDB-T test originally written by Patrick Boettcher
     &sub-examples;
   </chapter>
 <!-- END OF CHAPTERS -->
-  <appendix id="frontend_h">
-    <title>DVB Frontend Header File</title>
-    &sub-frontend-h;
-  </appendix>
-
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,7 +25,6 @@ @@
     *.elf
     *.bin
     *.gz
-    *.bz2
     *.lzma
     *.patch
     *.gcno
@@ Expand Down @@