---

yaml
---
r: 155475
b: refs/heads/master
c: 7e0c508
h: refs/heads/master
i:
  155473: f6f1e2a
  155471: bb390d2
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5be6717e0d2493a20791d592e2d20fd2b2f62d44
+refs/heads/master: 7e0c5086c172ecf8b0c2ad860b02a586967d17d0

trunk/.gitignore

@@ -27,7 +27,6 @@
 *.gz
 *.lzma
 *.patch
-*.gcno
 
 #
 # Top-level generic files

trunk/Documentation/DocBook/mac80211.tmpl

@@ -184,6 +184,8 @@ usage should require reading the full document.
 !Finclude/net/mac80211.h ieee80211_ctstoself_get
 !Finclude/net/mac80211.h ieee80211_ctstoself_duration
 !Finclude/net/mac80211.h ieee80211_generic_frame_duration
+!Finclude/net/mac80211.h ieee80211_get_hdrlen_from_skb
+!Finclude/net/mac80211.h ieee80211_hdrlen
 !Finclude/net/mac80211.h ieee80211_wake_queue
 !Finclude/net/mac80211.h ieee80211_stop_queue
 !Finclude/net/mac80211.h ieee80211_wake_queues

trunk/Documentation/block/data-integrity.txt

@@ -50,7 +50,7 @@ encouraged them to allow separation of the data and integrity metadata
 scatter-gather lists.
 
 The controller will interleave the buffers on write and split them on
-read.  This means that Linux can DMA the data buffers to and from
+read.  This means that the Linux can DMA the data buffers to and from
 host memory without changes to the page cache.
 
 Also, the 16-bit CRC checksum mandated by both the SCSI and SATA specs
@@ -66,7 +66,7 @@ software RAID5).
 
 The IP checksum is weaker than the CRC in terms of detecting bit
 errors.  However, the strength is really in the separation of the data
-buffers and the integrity metadata.  These two distinct buffers must
+buffers and the integrity metadata.  These two distinct buffers much
 match up for an I/O to complete.
 
 The separation of the data and integrity metadata buffers as well as

trunk/Documentation/cgroups/cpusets.txt

@@ -777,18 +777,6 @@ in cpuset directories:
 # /bin/echo 1-4 > cpus		-> set cpus list to cpus 1,2,3,4
 # /bin/echo 1,2,3,4 > cpus	-> set cpus list to cpus 1,2,3,4
 
-To add a CPU to a cpuset, write the new list of CPUs including the
-CPU to be added. To add 6 to the above cpuset:
-
-# /bin/echo 1-4,6 > cpus	-> set cpus list to cpus 1,2,3,4,6
-
-Similarly to remove a CPU from a cpuset, write the new list of CPUs
-without the CPU to be removed.
-
-To remove all the CPUs:
-
-# /bin/echo "" > cpus		-> clear cpus list
-
 2.3 Setting flags
 -----------------
 

trunk/Documentation/driver-model/driver.txt

@@ -207,8 +207,8 @@ Attributes
 ~~~~~~~~~~
 struct driver_attribute {
         struct attribute        attr;
-        ssize_t (*show)(struct device_driver *driver, char *buf);
-        ssize_t (*store)(struct device_driver *, const char * buf, size_t count);
+        ssize_t (*show)(struct device_driver *, char * buf, size_t count, loff_t off);
+        ssize_t (*store)(struct device_driver *, const char * buf, size_t count, loff_t off);
 };
 
 Device drivers can export attributes via their sysfs directories. 

trunk/Documentation/dvb/get_dvb_firmware

@@ -25,7 +25,7 @@ use IO::Handle;
 		"tda10046lifeview", "av7110", "dec2000t", "dec2540t",
 		"dec3000s", "vp7041", "dibusb", "nxt2002", "nxt2004",
 		"or51211", "or51132_qam", "or51132_vsb", "bluebird",
-		"opera1", "cx231xx", "cx18", "cx23885", "pvrusb2", "mpc718" );
+		"opera1", "cx231xx", "cx18", "cx23885", "pvrusb2" );
 
 # Check args
 syntax() if (scalar(@ARGV) != 1);
@@ -381,57 +381,6 @@ sub cx18 {
     $allfiles;
 }
 
-sub mpc718 {
-    my $archive = 'Yuan MPC718 TV Tuner Card 2.13.10.1016.zip';
-    my $url = "ftp://ftp.work.acer-euro.com/desktop/aspire_idea510/vista/Drivers/$archive";
-    my $fwfile = "dvb-cx18-mpc718-mt352.fw";
-    my $tmpdir = tempdir(DIR => "/tmp", CLEANUP => 1);
-
-    checkstandard();
-    wgetfile($archive, $url);
-    unzip($archive, $tmpdir);
-
-    my $sourcefile = "$tmpdir/Yuan MPC718 TV Tuner Card 2.13.10.1016/mpc718_32bit/yuanrap.sys";
-    my $found = 0;
-
-    open IN, '<', $sourcefile or die "Couldn't open $sourcefile to extract $fwfile data\n";
-    binmode IN;
-    open OUT, '>', $fwfile;
-    binmode OUT;
-    {
-	# Block scope because we change the line terminator variable $/
-	my $prevlen = 0;
-	my $currlen;
-
-	# Buried in the data segment are 3 runs of almost identical
-	# register-value pairs that end in 0x5d 0x01 which is a "TUNER GO"
-	# command for the MT352.
-	# Pull out the middle run (because it's easy) of register-value
-	# pairs to make the "firmware" file.
-
-	local $/ = "\x5d\x01"; # MT352 "TUNER GO"
-
-	while (<IN>) {
-	    $currlen = length($_);
-	    if ($prevlen == $currlen && $currlen <= 64) {
-		chop; chop; # Get rid of "TUNER GO"
-		s/^\0\0//;  # get rid of leading 00 00 if it's there
-		printf OUT "$_";
-		$found = 1;
-		last;
-	    }
-	    $prevlen = $currlen;
-	}
-    }
-    close OUT;
-    close IN;
-    if (!$found) {
-	unlink $fwfile;
-	die "Couldn't find valid register-value sequence in $sourcefile for $fwfile\n";
-    }
-    $fwfile;
-}
-
 sub cx23885 {
     my $url = "http://linuxtv.org/downloads/firmware/";