Merge commit 'v3.6' into xilinx-master

This is complicated merge and I hope that there
won't be too many problems.
I don't like git merge command behavior
where you can't see changes in emacps driver
because it doesn't exist in mainline.

Here is the reason why emacps must be fixed.

net: xilinx_emacps: IRQF_SAMPLE_RANDOM was removed

It was removed by this commit.
"random: final removal of IRQF_SAMPLE_RANDOM"
(sha1: b4237003)

Some fixes have to be done in the usb subsystem.

Signed-off-by: Michal Simek <monstr@monstr.eu>