---

yaml --- r: 285042 b: refs/heads/master c: e234b5f h: refs/heads/master v: v3
git-mirror · Jan 15, 2012 · 3b88347 · 3b88347
1 parent ac9dd5f
commit 3b88347
Show file tree

Hide file tree

Showing 1,105 changed files with 17,737 additions and 39,308 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c49c41a4134679cecb77362e7f6b59acb6320aa7
+refs/heads/master: e234b5f2079414b3d772286e3ee00e7bbf6da833
diff --git a/trunk/CREDITS b/trunk/CREDITS
@@ -514,11 +514,6 @@ S: Bessemerstraat 21
 S: Amsterdam
 S: The Netherlands
 
-N: NeilBrown
-E: neil@brown.name
-P: 4096R/566281B9 1BC6 29EB D390 D870 7B5F  497A 39EC 9EDD 5662 81B9
-D: NFSD Maintainer 2000-2007
-
 N: Zach Brown
 E: zab@zabbo.net
 D: maestro pci sound

diff --git a/trunk/Documentation/ABI/testing/sysfs-module b/trunk/Documentation/ABI/testing/sysfs-module
@@ -33,19 +33,3 @@ Description:	Maximum time allowed for periodic transfers per microframe (μs)
 		Beware, non-standard modes are usually not thoroughly tested by
 		hardware designers, and the hardware can malfunction when this
 		setting differ from default 100.
-
-What:		/sys/module/*/{coresize,initsize}
-Date:		Jan 2012
-KernelVersion:»·3.3
-Contact:	Kay Sievers <kay.sievers@vrfy.org>
-Description:	Module size in bytes.
-
-What:		/sys/module/*/taint
-Date:		Jan 2012
-KernelVersion:»·3.3
-Contact:	Kay Sievers <kay.sievers@vrfy.org>
-Description:	Module taint flags:
-			P - proprietary module
-			O - out-of-tree module
-			F - force-loaded module
-			C - staging driver module
diff --git a/trunk/Documentation/DocBook/media/v4l/pixfmt-nv24.xml b/trunk/Documentation/DocBook/media/v4l/pixfmt-nv24.xml
diff --git a/trunk/Documentation/DocBook/media/v4l/pixfmt.xml b/trunk/Documentation/DocBook/media/v4l/pixfmt.xml
@@ -714,7 +714,6 @@ information.</para>
     &sub-nv12m;
     &sub-nv12mt;
     &sub-nv16;
-    &sub-nv24;
     &sub-m420;
   </section>
 

diff --git a/trunk/Documentation/devicetree/bindings/mfd/mc13xxx.txt b/trunk/Documentation/devicetree/bindings/mfd/mc13xxx.txt
diff --git a/trunk/Documentation/devicetree/bindings/mfd/twl-familly.txt b/trunk/Documentation/devicetree/bindings/mfd/twl-familly.txt
diff --git a/trunk/Documentation/devicetree/bindings/resource-names.txt b/trunk/Documentation/devicetree/bindings/resource-names.txt
diff --git a/trunk/Documentation/dma-buf-sharing.txt b/trunk/Documentation/dma-buf-sharing.txt
@@ -219,10 +219,6 @@ NOTES:
    If the exporter chooses not to allow an attach() operation once a
    map_dma_buf() API has been called, it simply returns an error.
 
-Miscellaneous notes:
-- Any exporters or users of the dma-buf buffer sharing framework must have
-  a 'select DMA_SHARED_BUFFER' in their respective Kconfigs.
-
 References:
 [1] struct dma_buf_ops in include/linux/dma-buf.h
 [2] All interfaces mentioned above defined in include/linux/dma-buf.h