---

yaml
---
r: 175575
b: refs/heads/master
c: e1b8090
h: refs/heads/master
i:
  175573: 3e2b40a
  175571: 00a3317
  175567: c135f46
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 053fe57ac249a9531c396175778160d9e9509399
+refs/heads/master: e1b8090bdf125f8b2e192149547fead7f302a89c

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)

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)

trunk/Documentation/ABI/testing/sysfs-bus-usb

@@ -144,16 +144,3 @@ Description:
 
 		Write a 1 to force the device to disconnect
 		(equivalent to unplugging a wired USB device).
-
-What:		/sys/bus/usb/drivers/.../remove_id
-Date:		November 2009
-Contact:	CHENG Renquan <rqcheng@smu.edu.sg>
-Description:
-		Writing a device ID to this file will remove an ID
-		that was dynamically added via the new_id sysfs entry.
-		The format for the device ID is:
-		idVendor idProduct.	After successfully
-		removing an ID, the driver will no longer support the
-		device.  This is useful to ensure auto probing won't
-		match the driver to the device.  For example:
-		# echo "046d c315" > /sys/bus/usb/drivers/foo/remove_id

trunk/Documentation/ABI/testing/sysfs-class-uwb_rc-wusbhc

@@ -23,16 +23,3 @@ Description:
                 Since this relates to security (specifically, the
                 lifetime of PTKs and GTKs) it should not be changed
                 from the default.
-
-What:           /sys/class/uwb_rc/uwbN/wusbhc/wusb_phy_rate
-Date:           August 2009
-KernelVersion:  2.6.32
-Contact:        David Vrabel <david.vrabel@csr.com>
-Description:
-                The maximum PHY rate to use for all connected devices.
-                This is only of limited use for testing and
-                development as the hardware's automatic rate
-                adaptation is better then this simple control.
-
-                Refer to [ECMA-368] section 10.3.1.1 for the value to
-                use.

trunk/Documentation/ABI/testing/sysfs-devices-system-cpu

@@ -136,24 +136,6 @@ Description:	Discover cpuidle policy and mechanism
 		See files in Documentation/cpuidle/ for more information.
 
 
-What:		/sys/devices/system/cpu/cpu#/cpufreq/*
-Date:		pre-git history
-Contact:	cpufreq@vger.kernel.org
-Description:	Discover and change clock speed of CPUs
-
-		Clock scaling allows you to change the clock speed of the
-		CPUs on the fly. This is a nice method to save battery
-		power, because the lower the clock speed, the less power
-		the CPU consumes.
-
-		There are many knobs to tweak in this directory.
-
-		See files in Documentation/cpu-freq/ for more information.
-
-		In particular, read Documentation/cpu-freq/user-guide.txt
-		to learn how to control the knobs.
-
-
 What:      /sys/devices/system/cpu/cpu*/cache/index*/cache_disable_X
 Date:      August 2008
 KernelVersion:	2.6.27

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);
 	}
 

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">

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>
-