---

yaml
---
r: 137551
b: refs/heads/master
c: 4731f8b
h: refs/heads/master
i:
  137549: dd1354d
  137547: 9d6ecc0
  137543: f5ebdfc
  137535: 491e6bd
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ed40d0c472b136682b2fcba05f89762859c7374f
+refs/heads/master: 4731f8b66dd34ebf0e67ca6ba9162b0e509bec06

trunk/CREDITS

@@ -3738,7 +3738,7 @@ S: 93149 Nittenau
 S: Germany
 
 N: Gertjan van Wingerde
-E: gwingerde@gmail.com
+E: gwingerde@home.nl
 D: Ralink rt2x00 WLAN driver
 D: Minix V2 file-system
 D: Misc fixes

trunk/Documentation/DocBook/Makefile

@@ -12,8 +12,7 @@ DOCBOOKS := z8530book.xml mcabook.xml device-drivers.xml \
 	    kernel-api.xml filesystems.xml lsm.xml usb.xml kgdb.xml \
 	    gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \
 	    genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \
-	    mac80211.xml debugobjects.xml sh.xml regulator.xml \
-	    alsa-driver-api.xml writing-an-alsa-driver.xml
+	    mac80211.xml debugobjects.xml sh.xml regulator.xml
 
 ###
 # The build process is as follows (targets):

trunk/Documentation/DocBook/genericirq.tmpl

@@ -440,7 +440,6 @@ desc->chip->end();
      used in the generic IRQ layer.
      </para>
 !Iinclude/linux/irq.h
-!Iinclude/linux/interrupt.h
   </chapter>
 
   <chapter id="pubfunctions">

trunk/Documentation/DocBook/mac80211.tmpl

@@ -17,7 +17,8 @@
     </authorgroup>
 
     <copyright>
-      <year>2007-2009</year>
+      <year>2007</year>
+      <year>2008</year>
       <holder>Johannes Berg</holder>
     </copyright>
 
@@ -164,8 +165,8 @@ usage should require reading the full document.
 !Pinclude/net/mac80211.h Frame format
       </sect1>
       <sect1>
-        <title>Packet alignment</title>
-!Pnet/mac80211/rx.c Packet alignment
+        <title>Alignment issues</title>
+        <para>TBD</para>
       </sect1>
       <sect1>
         <title>Calling into mac80211 from interrupts</title>
@@ -222,17 +223,6 @@ usage should require reading the full document.
 !Finclude/net/mac80211.h ieee80211_key_flags
     </chapter>
 
-    <chapter id="powersave">
-      <title>Powersave support</title>
-!Pinclude/net/mac80211.h Powersave support
-    </chapter>
-
-    <chapter id="beacon-filter">
-      <title>Beacon filter support</title>
-!Pinclude/net/mac80211.h Beacon filter support
-!Finclude/net/mac80211.h ieee80211_beacon_loss
-    </chapter>
-
     <chapter id="qos">
       <title>Multiple queues and QoS support</title>
       <para>TBD</para>

trunk/Documentation/DocBook/uio-howto.tmpl

@@ -41,13 +41,6 @@ GPL version 2.
 </abstract>
 
 <revhistory>
-	<revision>
-	<revnumber>0.8</revnumber>
-	<date>2008-12-24</date>
-	<authorinitials>hjk</authorinitials>
-	<revremark>Added name attributes in mem and portio sysfs directories.
-		</revremark>
-	</revision>
 	<revision>
 	<revnumber>0.7</revnumber>
 	<date>2008-12-23</date>
@@ -310,17 +303,10 @@ interested in translating it, please email me
 	appear if the size of the mapping is not 0.
 </para>
 <para>
-	Each <filename>mapX/</filename> directory contains four read-only files
-	that show attributes of the memory:
+	Each <filename>mapX/</filename> directory contains two read-only files
+	that show start address and size of the memory:
 </para>
 <itemizedlist>
-<listitem>
-	<para>
-	<filename>name</filename>: A string identifier for this mapping. This
-	is optional, the string can be empty. Drivers can set this to make it
-	easier for userspace to find the correct mapping.
-	</para>
-</listitem>
 <listitem>
 	<para>
 	<filename>addr</filename>: The address of memory that can be mapped.
@@ -380,17 +366,10 @@ offset = N * getpagesize();
 	<filename>/sys/class/uio/uioX/portio/</filename>.
 </para>
 <para>
-	Each <filename>portX/</filename> directory contains four read-only
-	files that show name, start, size, and type of the port region:
+	Each <filename>portX/</filename> directory contains three read-only
+	files that show start, size, and type of the port region:
 </para>
 <itemizedlist>
-<listitem>
-	<para>
-	<filename>name</filename>: A string identifier for this port region.
-	The string is optional and can be empty. Drivers can set it to make it
-	easier for userspace to find a certain port region.
-	</para>
-</listitem>
 <listitem>
 	<para>
 	<filename>start</filename>: The first port of this region.

trunk/Documentation/arm/Samsung-S3C24XX/Suspend.txt

@@ -40,13 +40,13 @@ Resuming
 Machine Support
 ---------------
 
-  The machine specific functions must call the s3c_pm_init() function
+  The machine specific functions must call the s3c2410_pm_init() function
   to say that its bootloader is capable of resuming. This can be as
   simple as adding the following to the machine's definition:
 
-  INITMACHINE(s3c_pm_init)
+  INITMACHINE(s3c2410_pm_init)
 
-  A board can do its own setup before calling s3c_pm_init, if it
+  A board can do its own setup before calling s3c2410_pm_init, if it
   needs to setup anything else for power management support.
 
   There is currently no support for over-riding the default method of
@@ -74,7 +74,7 @@ statuc void __init machine_init(void)
 
 	enable_irq_wake(IRQ_EINT0);
 
-	s3c_pm_init();
+	s3c2410_pm_init();
 }
 
 

trunk/Documentation/arm/memory.txt

@@ -29,14 +29,7 @@ ffff0000	ffff0fff	CPU vector page.
 				CPU supports vector relocation (control
 				register V bit.)
 
-fffe0000	fffeffff	XScale cache flush area.  This is used
-				in proc-xscale.S to flush the whole data
-				cache.  Free for other usage on non-XScale.
-
-fff00000	fffdffff	Fixmap mapping region.  Addresses provided
-				by fix_to_virt() will be located here.
-
-ffc00000	ffefffff	DMA memory mapping region.  Memory returned
+ffc00000	fffeffff	DMA memory mapping region.  Memory returned
 				by the dma_alloc_xxx functions will be
 				dynamically mapped here.
 

trunk/Documentation/block/switching-sched.txt

@@ -35,3 +35,9 @@ noop anticipatory deadline [cfq]
 # echo anticipatory > /sys/block/hda/queue/scheduler
 # cat /sys/block/hda/queue/scheduler
 noop [anticipatory] deadline cfq
+
+Each io queue has a set of io scheduler tunables associated with it. These
+tunables control how the io scheduler works. You can find these entries
+in:
+
+/sys/block/<device>/queue/iosched

trunk/Documentation/cpu-freq/governors.txt

@@ -117,28 +117,10 @@ accessible parameters:
 sampling_rate: measured in uS (10^-6 seconds), this is how often you
 want the kernel to look at the CPU usage and to make decisions on
 what to do about the frequency.  Typically this is set to values of
-around '10000' or more. It's default value is (cmp. with users-guide.txt):
-transition_latency * 1000
-The lowest value you can set is:
-transition_latency * 100 or it may get restricted to a value where it
-makes not sense for the kernel anymore to poll that often which depends
-on your HZ config variable (HZ=1000: max=20000us, HZ=250: max=5000).
-Be aware that transition latency is in ns and sampling_rate is in us, so you
-get the same sysfs value by default.
-Sampling rate should always get adjusted considering the transition latency
-To set the sampling rate 750 times as high as the transition latency
-in the bash (as said, 1000 is default), do:
-echo `$(($(cat cpuinfo_transition_latency) * 750 / 1000)) \
-    >ondemand/sampling_rate
-
-show_sampling_rate_(min|max): THIS INTERFACE IS DEPRECATED, DON'T USE IT.
-You can use wider ranges now and the general
-cpuinfo_transition_latency variable (cmp. with user-guide.txt) can be
-used to obtain exactly the same info:
-show_sampling_rate_min = transtition_latency * 500    / 1000
-show_sampling_rate_max = transtition_latency * 500000 / 1000
-(divided by 1000 is to illustrate that sampling rate is in us and
-transition latency is exported ns).
+around '10000' or more.
+
+show_sampling_rate_(min|max): the minimum and maximum sampling rates
+available that you may set 'sampling_rate' to.
 
 up_threshold: defines what the average CPU usage between the samplings
 of 'sampling_rate' needs to be for the kernel to make a decision on

trunk/Documentation/cpu-freq/user-guide.txt

@@ -152,18 +152,6 @@ cpuinfo_min_freq :		this file shows the minimum operating
 				frequency the processor can run at(in kHz) 
 cpuinfo_max_freq :		this file shows the maximum operating
 				frequency the processor can run at(in kHz) 
-cpuinfo_transition_latency	The time it takes on this CPU to
-				switch between two frequencies in nano
-				seconds. If unknown or known to be
-				that high that the driver does not
-				work with the ondemand governor, -1
-				(CPUFREQ_ETERNAL) will be returned.
-				Using this information can be useful
-				to choose an appropriate polling
-				frequency for a kernel governor or
-				userspace daemon. Make sure to not
-				switch the frequency too often
-				resulting in performance loss.
 scaling_driver :		this file shows what cpufreq driver is
 				used to set the frequency on this CPU
 

trunk/Documentation/dontdiff

@@ -62,6 +62,7 @@ aic7*reg_print.c*
 aic7*seq.h*
 aicasm
 aicdb.h*
+asm
 asm-offsets.h
 asm_offsets.h
 autoconf.h*