Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/gi…

…t/torvalds/linux-2.6 into rmobile-latest
bspratt · May 24, 2011 · d08fe47 · d08fe47
2 parents fb66c52 + d762f43
commit d08fe47
Show file tree

Hide file tree

Showing 266 changed files with 19,076 additions and 5,011 deletions.
diff --git a/Documentation/DocBook/.gitignore b/Documentation/DocBook/.gitignore
@@ -8,3 +8,4 @@
 *.dvi
 *.log
 *.out
+media/
diff --git a/Documentation/DocBook/dvb/dvbapi.xml b/Documentation/DocBook/dvb/dvbapi.xml
@@ -34,6 +34,14 @@
 
 <revhistory>
 <!-- Put document revisions here, newest first. -->
+<revision>
+	<revnumber>2.0.4</revnumber>
+	<date>2011-05-06</date>
+	<authorinitials>mcc</authorinitials>
+	<revremark>
+		Add more information about DVB APIv5, better describing the frontend GET/SET props ioctl's.
+	</revremark>
+</revision>
 <revision>
 	<revnumber>2.0.3</revnumber>
 	<date>2010-07-03</date>
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,3 +8,4 @@ @@
     *.dvi
     *.log
     *.out
+    media/