linux-next: manual merge of the imx-mxs tree with the arm-soc tree

[Stephen Rothwell]

Hi Arnd,

On Tue, 13 Jan 2015 14:18:32 +0100 Arnd Bergmann <arnd at arndb.de> wrote:
>
> There is an extraneous '\' character behind imx6sx-sdb.dtb now, which caused
> build errors for me. We should soon be able to merge the other branches into
> arm-soc to avoid the entire set of merge conflicts, until then please
> change your recorded resolution to avoid the build error.

Oops, sorry about that. Fixed.

-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150114/68eb7dff/attachment.sig>