Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/phy/freescale/phy-fsl-samsung-hdmi.c
Simple merge

diff --cc drivers/phy/phy-core.c
Simple merge

diff --cc drivers/phy/qualcomm/phy-qcom-qmp-usb.c
Simple merge

diff --cc drivers/phy/rockchip/phy-rockchip-naneng-combphy.c
Simple merge