---

yaml
---
r: 261087
b: refs/heads/master
c: a134b82
h: refs/heads/master
i:
  261085: 98b8cda
  261083: 3e8cc73
  261079: a108861
  261071: 65b2960
  261055: 5a29f76
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 59ed2bb27492f74ab898ee1e26c69dfd78444640
+refs/heads/master: a134b825608df6382dbcf4fe2c54232ba8f7355f

trunk/.gitignore

@@ -45,11 +45,6 @@ modules.builtin
 /Module.markers
 /Module.symvers
 
-#
-# Debian directory (make deb-pkg)
-#
-/debian/
-
 #
 # git files that we don't want to ignore even it they are dot-files
 #

trunk/.mailmap

@@ -73,7 +73,8 @@ Linas Vepstas <linas@austin.ibm.com>
 Mark Brown <broonie@sirena.org.uk>
 Matthieu CASTET <castet.matthieu@free.fr>
 Mayuresh Janorkar <mayur@ti.com>
-Michael Buesch <m@bues.ch>
+Michael Buesch <mb@bu3sch.de>
+Michael Buesch <mbuesch@freenet.de>
 Michel Dänzer <michel@tungstengraphics.com>
 Mitesh shah <mshah@teja.com>
 Morten Welinder <terra@gnome.org>

trunk/Documentation/ABI/obsolete/proc-pid-oom_adj

@@ -14,7 +14,7 @@ Why:	/proc/<pid>/oom_adj allows userspace to influence the oom killer's
 
 	A much more powerful interface, /proc/<pid>/oom_score_adj, was
 	introduced with the oom killer rewrite that allows users to increase or
-	decrease the badness score linearly.  This interface will replace
+	decrease the badness() score linearly.  This interface will replace
 	/proc/<pid>/oom_adj.
 
 	A warning will be emitted to the kernel log if an application uses this

trunk/Documentation/ABI/testing/sysfs-driver-hid-roccat-koneplus

@@ -92,14 +92,6 @@ Description:	The mouse has a tracking- and a distance-control-unit. These
 		This file is writeonly.
 Users:		http://roccat.sourceforge.net
 
-What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/koneplus/roccatkoneplus<minor>/talk
-Date:		May 2011
-Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>
-Description:	Used to active some easy* functions of the mouse from outside.
-		The data has to be 16 bytes long.
-		This file is writeonly.
-Users:		http://roccat.sourceforge.net
-
 What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/koneplus/roccatkoneplus<minor>/tcu
 Date:		October 2010
 Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>

trunk/Documentation/ABI/testing/sysfs-module

@@ -10,26 +10,3 @@ KernelVersion:	2.6.35
 Contact:	masa-korg@dsn.okisemi.com
 Description:	Write/read Option ROM data.
 
-
-What:		/sys/module/ehci_hcd/drivers/.../uframe_periodic_max
-Date:		July 2011
-KernelVersion:	3.1
-Contact:	Kirill Smelkov <kirr@mns.spb.ru>
-Description:	Maximum time allowed for periodic transfers per microframe (μs)
-
-		[ USB 2.0 sets maximum allowed time for periodic transfers per
-		  microframe to be 80%, that is 100 microseconds out of 125
-		  microseconds (full microframe).
-
-		  However there are cases, when 80% max isochronous bandwidth is
-		  too limiting. For example two video streams could require 110
-		  microseconds of isochronous bandwidth per microframe to work
-		  together. ]
-
-		Through this setting it is possible to raise the limit so that
-		the host controller would allow allocating more than 100
-		microseconds of periodic bandwidth per microframe.
-
-		Beware, non-standard modes are usually not thoroughly tested by
-		hardware designers, and the hardware can malfunction when this
-		setting differ from default 100.

trunk/Documentation/DMA-API-HOWTO.txt

@@ -613,13 +613,13 @@ to use the dma_sync_*() interfaces.
 				pass_to_upper_layers(cp->rx_buf);
 				make_and_setup_new_rx_buf(cp);
 			} else {
-				/* CPU should not write to
-				 * DMA_FROM_DEVICE-mapped area,
-				 * so dma_sync_single_for_device() is
-				 * not needed here. It would be required
-				 * for DMA_BIDIRECTIONAL mapping if
-				 * the memory was modified.
+				/* Just sync the buffer and give it back
+				 * to the card.
 				 */
+				dma_sync_single_for_device(&cp->dev,
+							   cp->rx_dma,
+							   cp->rx_len,
+							   DMA_FROM_DEVICE);
 				give_rx_buf_to_card(cp);
 			}
 		}

trunk/Documentation/DocBook/80211.tmpl

@@ -402,9 +402,8 @@
 !Finclude/net/mac80211.h set_key_cmd
 !Finclude/net/mac80211.h ieee80211_key_conf
 !Finclude/net/mac80211.h ieee80211_key_flags
-!Finclude/net/mac80211.h ieee80211_get_tkip_p1k
-!Finclude/net/mac80211.h ieee80211_get_tkip_p1k_iv
-!Finclude/net/mac80211.h ieee80211_get_tkip_p2k
+!Finclude/net/mac80211.h ieee80211_tkip_key_type
+!Finclude/net/mac80211.h ieee80211_get_tkip_key
 !Finclude/net/mac80211.h ieee80211_key_removed
       </chapter>