linux-next: manual merge of the char-misc tree with the staging tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the char-misc tree got a conflict in:

  drivers/staging/goldfish/goldfish_nand.c

between commit:

  814625b539d3 ("staging: goldfish: goldfish_nand: Return correct error code")

from the staging tree and commit:

  3e2fbc7feec4 ("Staging: goldfish: goldfish_nand: Add DMA Support using dmam_alloc_coherent")

from the char-misc tree.

I fixed it up (the latter incorporated the former) and can carry the
fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell