linux-next: manual merge of the akpm tree with the staging tree

[Stephen Rothwell]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
drivers/staging/emxx_udc/emxx_udc.c between commit 6de2a1a7b9e2
("staging: emxx_udc: Fix build error") from the staging tree and commit
"drivers/staging/emxx_udc/emxx_udc.c: replace strict_strto() with
kstrto()" from the akpm tree.

I fixed it up (I just used the version from the staging tree) and can
carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    s...@canb.auug.org.au

signature.asc
Description: PGP signature