Merge remote-tracking branch 'char-misc/char-misc-next'

diff --cc Documentation/devicetree/bindings/arm/atmel-at91.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/char/agp/amd64-agp.c
Simple merge

diff --cc drivers/misc/mic/host/mic_device.h
Simple merge

diff --cc drivers/phy/Kconfig
Simple merge

diff --cc drivers/phy/Makefile
index c447f1a98ac5f0ab07167deb66088573208a8d34,4e4adc96f753cfd9bd1d5a28d139b5c668d25a46..b57c25371cca48695cf6068f61cfbd85e44c281b
--- 1/drivers/phy/Makefile
--- 2/drivers/phy/Makefile
+++ b/drivers/phy/Makefile
@@@ -3,8 -3,8 +3,9 @@@
  #
  
  obj-$(CONFIG_GENERIC_PHY)             += phy-core.o
 +obj-$(CONFIG_BCM_KONA_USB2_PHY)               += phy-bcm-kona-usb2.o
  obj-$(CONFIG_PHY_EXYNOS_DP_VIDEO)     += phy-exynos-dp-video.o
  obj-$(CONFIG_PHY_EXYNOS_MIPI_VIDEO)   += phy-exynos-mipi-video.o
+ obj-$(CONFIG_PHY_MVEBU_SATA)          += phy-mvebu-sata.o
  obj-$(CONFIG_OMAP_USB2)                       += phy-omap-usb2.o
  obj-$(CONFIG_TWL4030_USB)             += phy-twl4030-usb.o

diff --cc include/linux/mfd/arizona/registers.h
Simple merge