Merge commit 'linus/master' into tracing/kprobes

Conflicts:
	kernel/trace/Makefile
	kernel/trace/trace.h
	kernel/trace/trace_event_types.h
	kernel/trace/trace_export.c

Merge reason:
	Sync with latest significant tracing core changes.

1 files changed, 75 insertions, 0 deletions

diff --git a/Documentation/DocBook/v4l/pixfmt-sbggr8.xml b/Documentation/DocBook/v4l/pixfmt-sbggr8.xml
new file mode 100644
index 000000000000..5fe84ecc2ebe
--- /dev/null
+++ b/Documentation/DocBook/v4l/pixfmt-sbggr8.xml
@@ -0,0 +1,75 @@
+    <refentry id="V4L2-PIX-FMT-SBGGR8">
+      <refmeta>
+        <refentrytitle>V4L2_PIX_FMT_SBGGR8 ('BA81')</refentrytitle>
+        &manvol;
+      </refmeta>
+      <refnamediv>
+        <refname><constant>V4L2_PIX_FMT_SBGGR8</constant></refname>
+        <refpurpose>Bayer RGB format</refpurpose>
+      </refnamediv>
+      <refsect1>
+        <title>Description</title>
+
+        <para>This is commonly the native format of digital cameras,
+reflecting the arrangement of sensors on the CCD device. Only one red,
+green or blue value is given for each pixel. Missing components must
+be interpolated from neighbouring pixels. From left to right the first
+row consists of a blue and green value, the second row of a green and
+red value. This scheme repeats to the right and down for every two
+columns and rows.</para>
+
+        <example>
+          <title><constant>V4L2_PIX_FMT_SBGGR8</constant> 4 &times; 4
+pixel image</title>
+
+          <formalpara>
+            <title>Byte Order.</title>
+            <para>Each cell is one byte.
+              <informaltable frame="none">
+                <tgroup cols="5" align="center">
+                  <colspec align="left" colwidth="2*" />
+                  <tbody valign="top">
+                    <row>
+                      <entry>start&nbsp;+&nbsp;0:</entry>
+                      <entry>B<subscript>00</subscript></entry>
+                      <entry>G<subscript>01</subscript></entry>
+                      <entry>B<subscript>02</subscript></entry>
+                      <entry>G<subscript>03</subscript></entry>
+                    </row>
+                    <row>
+                      <entry>start&nbsp;+&nbsp;4:</entry>
+                      <entry>G<subscript>10</subscript></entry>
+                      <entry>R<subscript>11</subscript></entry>
+                      <entry>G<subscript>12</subscript></entry>
+                      <entry>R<subscript>13</subscript></entry>
+                    </row>
+                    <row>
+                      <entry>start&nbsp;+&nbsp;8:</entry>
+                      <entry>B<subscript>20</subscript></entry>
+                      <entry>G<subscript>21</subscript></entry>
+                      <entry>B<subscript>22</subscript></entry>
+                      <entry>G<subscript>23</subscript></entry>
+                    </row>
+                    <row>
+                      <entry>start&nbsp;+&nbsp;12:</entry>
+                      <entry>G<subscript>30</subscript></entry>
+                      <entry>R<subscript>31</subscript></entry>
+                      <entry>G<subscript>32</subscript></entry>
+                      <entry>R<subscript>33</subscript></entry>
+                    </row>
+                  </tbody>
+                </tgroup>
+              </informaltable>
+            </para>
+          </formalpara>
+        </example>
+      </refsect1>
+    </refentry>
+
+  <!--
+Local Variables:
+mode: sgml
+sgml-parent-document: "pixfmt.sgml"
+indent-tabs-mode: nil
+End:
+  -->