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

[Mark Brown]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/rtl8188eu/include/phy.h between Linus' tree and commit
"staging: rtl8188eu: using unique names is good" from the staging tree.

It looks like the patch is already applied so I skipped it.

pgpZt49LSNUZq.pgp
Description: PGP signature