linux-next: manual merge of the trivial tree with the v4l-dvb tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 1360 bytes --]

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
drivers/media/video/cx18/cx18-mailbox.h between commit
368cb90a38d346d76cd32d882fbc620fc01e4102 ("V4L/DVB (13429): cx18: Add
Memory Descriptor List (MDL) layer to buffer handling") from the v4l-dvb
tree and commit 6070d81eb5f2d4943223c96e7609a53cdc984364 ("tree-wide: fix
misspelling of "definition" in comments") from the trivial tree.

I fixed it up (see below) and can carry the fix as necessary.  It is very
trivial, though. :-)
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/media/video/cx18/cx18-mailbox.h
index 5ea0735,522ad53..0000000
--- a/drivers/media/video/cx18/cx18-mailbox.h
+++ b/drivers/media/video/cx18/cx18-mailbox.h
@@@ -39,9 -39,9 +39,9 @@@
  struct cx18;
  
  /*
 - * This structure is used by CPU to provide completed buffers information
 - * Its structure is dictrated by the layout of the SCB, required by the
 + * This structure is used by CPU to provide completed MDL & buffers information.
 + * Its structure is dictated by the layout of the SCB, required by the
-  * firmware, but its defintion needs to be here, instead of in cx18-scb.h,
+  * firmware, but its definition needs to be here, instead of in cx18-scb.h,
   * for mailbox work order scheduling
   */
  struct cx18_mdl_ack {

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]