Merge tag 'clk-for-linus-3.19' of git://git.linaro.org/people/mike.turquette/linux

Pull clk framework updates from Mike Turquette:
 "This is much later than usual due to several last minute bugs that had
  to be addressed.  As usual the majority of changes are new drivers and
  modifications to existing drivers.  The core recieved many fixes along
  with the groundwork for several large changes coming in the future
  which will better parition clock providers from clock consumers"

* tag 'clk-for-linus-3.19' of git://git.linaro.org/people/mike.turquette/linux: (86 commits)
  clk: samsung: Fix Exynos 5420 pinctrl setup and clock disable failure due to domain being gated
  ARM: OMAP3: clock: fix boot breakage in legacy mode
  ARM: OMAP2+: clock: fix DPLL code to use new determine rate APIs
  clk: Really fix deadlock with mmap_sem
  clk: mmp: fix sparse non static symbol warning
  clk: Change clk_ops->determine_rate to return a clk_hw as the best parent
  clk: change clk_debugfs_add_file to take a struct clk_hw
  clk: Don't expose __clk_get_accuracy
  clk: Don't try to use a struct clk* after it could have been freed
  clk: Remove unused function __clk_get_prepare_count
  clk: samsung: Fix double add of syscore ops after driver rebind
  clk: samsung: exynos4: set parent of sclk_hdmiphy to hdmi
  clk: samsung: exynos4415: Fix build with PM_SLEEP disabled
  clk: samsung: remove unnecessary inclusion of header files from clk.h
  clk: samsung: remove unnecessary CONFIG_OF from clk.c
  clk: samsung: Spelling s/bwtween/between/
  clk: rockchip: Add support for the mmc clock phases using the framework
  clk: rockchip: add bindings for the mmc clocks
  clk: rockchip: rk3288 export i2s0_clkout for use in DT
  clk: rockchip: use clock ID for DMC (memory controller) on rk3288
  ...

diff --combined MAINTAINERS
index 08f671dad3e935850a8eb636b0c2afb195ce1461,924499202dac89afab39ebd93005daa53fcb6ab5..ddb9ac8d32b3eddc46d66bd408392ae09b637ea7
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -618,16 -618,6 +618,16 @@@ S:       Maintaine
  F:    drivers/iommu/amd_iommu*.[ch]
  F:    include/linux/amd-iommu.h
  
 +AMD KFD
 +M:      Oded Gabbay <oded.gabbay@amd.com>
 +L:      dri-devel@lists.freedesktop.org
 +T:      git git://people.freedesktop.org/~gabbayo/linux.git
 +S:      Supported
 +F:      drivers/gpu/drm/amd/amdkfd/
 +F:      drivers/gpu/drm/radeon/radeon_kfd.c
 +F:      drivers/gpu/drm/radeon/radeon_kfd.h
 +F:      include/uapi/linux/kfd_ioctl.h
 +
  AMD MICROCODE UPDATE SUPPORT
  M:    Andreas Herrmann <herrmann.der.user@googlemail.com>
  L:    amd64-microcode@amd64.org
@@@ -860,7 -850,6 +860,7 @@@ ARM/Amlogic MesonX SoC suppor
  M:    Carlo Caione <carlo@caione.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
 +F:    drivers/media/rc/meson-ir.c
  N:    meson[x68]
  
  ARM/ATMEL AT91RM9200 AND AT91SAM ARM ARCHITECTURES
@@@ -872,7 -861,6 +872,7 @@@ W: http://maxim.org.za/at91_26.htm
  W:    http://www.linux4sam.org
  S:    Supported
  F:    arch/arm/mach-at91/
 +F:    include/soc/at91/
  F:    arch/arm/boot/dts/at91*.dts
  F:    arch/arm/boot/dts/at91*.dtsi
  F:    arch/arm/boot/dts/sama*.dts
@@@ -930,15 -918,6 +930,15 @@@ M:       Hubert Feurstein <hubert.feurstein@c
  S:    Maintained
  F:    arch/arm/mach-ep93xx/micro9.c
  
 +ARM/CORESIGHT FRAMEWORK AND DRIVERS
 +M:    Mathieu Poirier <mathieu.poirier@linaro.org>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    drivers/coresight/*
 +F:    Documentation/trace/coresight.txt
 +F:    Documentation/devicetree/bindings/arm/coresight.txt
 +F:    Documentation/ABI/testing/sysfs-bus-coresight-devices-*
 +
  ARM/CORGI MACHINE SUPPORT
  M:    Richard Purdie <rpurdie@rpsys.net>
  S:    Maintained
@@@ -1329,22 -1308,30 +1329,22 @@@ F:   drivers/*/*rockchip
  F:    drivers/*/*/*rockchip*
  F:    sound/soc/rockchip/
  
 -ARM/SAMSUNG ARM ARCHITECTURES
 -M:    Ben Dooks <ben-linux@fluff.org>
 -M:    Kukjin Kim <kgene.kim@samsung.com>
 +ARM/SAMSUNG EXYNOS ARM ARCHITECTURES
 +M:    Kukjin Kim <kgene@kernel.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:    linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
 -W:    http://www.fluff.org/ben/linux/
  S:    Maintained
  F:    arch/arm/boot/dts/s3c*
  F:    arch/arm/boot/dts/exynos*
  F:    arch/arm/plat-samsung/
  F:    arch/arm/mach-s3c24*/
  F:    arch/arm/mach-s3c64xx/
 +F:    arch/arm/mach-s5p*/
 +F:    arch/arm/mach-exynos*/
  F:    drivers/*/*s3c2410*
  F:    drivers/*/*/*s3c2410*
  F:    drivers/spi/spi-s3c*
  F:    sound/soc/samsung/*
 -
 -ARM/S5P EXYNOS ARM ARCHITECTURES
 -M:    Kukjin Kim <kgene.kim@samsung.com>
 -L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -L:    linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
 -S:    Maintained
 -F:    arch/arm/mach-s5p*/
 -F:    arch/arm/mach-exynos*/
  N:    exynos
  
  ARM/SAMSUNG MOBILE MACHINE SUPPORT
@@@ -1394,12 -1381,12 +1394,12 @@@ F:   arch/arm/boot/dts/sh
  F:    arch/arm/configs/ape6evm_defconfig
  F:    arch/arm/configs/armadillo800eva_defconfig
  F:    arch/arm/configs/bockw_defconfig
 -F:    arch/arm/configs/koelsch_defconfig
  F:    arch/arm/configs/kzm9g_defconfig
  F:    arch/arm/configs/lager_defconfig
  F:    arch/arm/configs/mackerel_defconfig
  F:    arch/arm/configs/marzen_defconfig
  F:    arch/arm/configs/shmobile_defconfig
 +F:    arch/arm/include/debug/renesas-scif.S
  F:    arch/arm/mach-shmobile/
  F:    drivers/sh/
  
@@@ -1443,7 -1430,6 +1443,7 @@@ F:      drivers/tty/serial/st-asc.
  F:    drivers/usb/dwc3/dwc3-st.c
  F:    drivers/usb/host/ehci-st.c
  F:    drivers/usb/host/ohci-st.c
 +F:    drivers/ata/ahci_st.c
  
  ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
  M:    Lennert Buytenhek <kernel@wantstofly.org>
@@@ -1517,19 -1503,6 +1517,19 @@@ S:    Maintaine
  F:    drivers/clk/ux500/
  F:    include/linux/platform_data/clk-ux500.h
  
 +ARM/VERSATILE EXPRESS PLATFORM
 +M:    Liviu Dudau <liviu.dudau@arm.com>
 +M:    Sudeep Holla <sudeep.holla@arm.com>
 +M:    Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    arch/arm/boot/dts/vexpress*
 +F:    arch/arm/mach-vexpress/
 +F:    */*/vexpress*
 +F:    */*/*/vexpress*
 +F:    drivers/clk/versatile/clk-vexpress-osc.c
 +F:    drivers/clocksource/versatile.c
 +
  ARM/VFP SUPPORT
  M:    Russell King <linux@arm.linux.org.uk>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -1741,13 -1714,6 +1741,13 @@@ F:    drivers/dma/at_hdmac.
  F:    drivers/dma/at_hdmac_regs.h
  F:    include/linux/platform_data/dma-atmel.h
  
 +ATMEL XDMA DRIVER
 +M:    Ludovic Desroches <ludovic.desroches@atmel.com>
 +L:    linux-arm-kernel@lists.infradead.org
 +L:    dmaengine@vger.kernel.org
 +S:    Supported
 +F:    drivers/dma/at_xdmac.c
 +
  ATMEL I2C DRIVER
  M:    Ludovic Desroches <ludovic.desroches@atmel.com>
  L:    linux-i2c@vger.kernel.org
@@@ -1820,11 -1786,10 +1820,11 @@@ S:   Supporte
  F:    drivers/scsi/esas2r
  
  AUDIT SUBSYSTEM
 +M:    Paul Moore <paul@paul-moore.com>
  M:    Eric Paris <eparis@redhat.com>
 -L:    linux-audit@redhat.com (subscribers-only)
 +L:    linux-audit@redhat.com (moderated for non-subscribers)
  W:    http://people.redhat.com/sgrubb/audit/
 -T:    git git://git.infradead.org/users/eparis/audit.git
 +T:    git git://git.infradead.org/users/pcmoore/audit
  S:    Maintained
  F:    include/linux/audit.h
  F:    include/uapi/linux/audit.h
@@@ -1863,7 -1828,7 +1863,7 @@@ F:      include/net/ax25.
  F:    net/ax25/
  
  AZ6007 DVB DRIVER
 -M:    Mauro Carvalho Chehab <m.chehab@samsung.com>
 +M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    linux-media@vger.kernel.org
  W:    http://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
@@@ -1897,6 -1862,7 +1897,6 @@@ F:      drivers/net/wireless/b43legacy
  
  BACKLIGHT CLASS/SUBSYSTEM
  M:    Jingoo Han <jg1.han@samsung.com>
 -M:    Bryan Wu <cooloney@gmail.com>
  M:    Lee Jones <lee.jones@linaro.org>
  S:    Maintained
  F:    drivers/video/backlight/
@@@ -1925,6 -1891,13 +1925,6 @@@ W:     http://bcache.evilpiepirate.or
  S:    Maintained:
  F:    drivers/md/bcache/
  
 -BECEEM BCS200/BCS220-3/BCSM250 WIMAX SUPPORT
 -M: Kevin McKinney <klmckinney1@gmail.com>
 -M: Matthias Beyer <mail@beyermatthias.de>
 -L: devel@driverdev.osuosl.org
 -S: Maintained
 -F: drivers/staging/bcm*
 -
  BEFS FILE SYSTEM
  S:    Orphan
  F:    Documentation/filesystems/befs.txt
@@@ -2105,14 -2078,6 +2105,14 @@@ T:    git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  N:    bcm2835
  
 +BROADCOM BCM33XX MIPS ARCHITECTURE
 +M:    Kevin Cernekee <cernekee@gmail.com>
 +L:    linux-mips@linux-mips.org
 +S:    Maintained
 +F:    arch/mips/bcm3384/*
 +F:    arch/mips/include/asm/mach-bcm3384/*
 +F:    arch/mips/kernel/*bmips*
 +
  BROADCOM BCM5301X ARM ARCHITECTURE
  M:    Hauke Mehrtens <hauke@hauke-m.de>
  L:    linux-arm-kernel@lists.infradead.org
@@@ -2129,34 -2094,13 +2129,34 @@@ S:   Maintaine
  F:    arch/arm/mach-bcm/bcm63xx.c
  F:    arch/arm/include/debug/bcm63xx.S
  
 +BROADCOM BCM63XX/BCM33XX UDC DRIVER
 +M:    Kevin Cernekee <cernekee@gmail.com>
 +L:    linux-usb@vger.kernel.org
 +S:    Maintained
 +F:    drivers/usb/gadget/udc/bcm63xx_udc.*
 +
  BROADCOM BCM7XXX ARM ARCHITECTURE
  M:    Marc Carino <marc.ceeeee@gmail.com>
  M:    Brian Norris <computersforpeace@gmail.com>
 +M:    Gregory Fong <gregory.0xf0@gmail.com>
 +M:    Florian Fainelli <f.fainelli@gmail.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-bcm/*brcmstb*
  F:    arch/arm/boot/dts/bcm7*.dts*
 +F:    drivers/bus/brcmstb_gisb.c
 +
 +BROADCOM BMIPS MIPS ARCHITECTURE
 +M:    Kevin Cernekee <cernekee@gmail.com>
 +M:    Florian Fainelli <f.fainelli@gmail.com>
 +L:    linux-mips@linux-mips.org
 +S:    Maintained
 +F:    arch/mips/bmips/*
 +F:    arch/mips/include/asm/mach-bmips/*
 +F:    arch/mips/kernel/*bmips*
 +F:    arch/mips/boot/dts/bcm*.dts*
 +F:    drivers/irqchip/irq-bcm7*
 +F:    drivers/irqchip/irq-brcmstb*
  
  BROADCOM TG3 GIGABIT ETHERNET DRIVER
  M:    Prashant Sreedharan <prashant@broadcom.com>
@@@ -2187,20 -2131,6 +2187,20 @@@ L:    linux-scsi@vger.kernel.or
  S:    Supported
  F:    drivers/scsi/bnx2i/
  
 +BROADCOM CYGNUS/IPROC ARM ARCHITECTURE
 +M:    Ray Jui <rjui@broadcom.com>
 +M:    Scott Branden <sbranden@broadcom.com>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +L:    bcm-kernel-feedback-list@broadcom.com
 +T:    git git://git.github.com/brcm/linux.git
 +S:    Maintained
 +N:    iproc
 +N:    cygnus
 +N:    bcm9113*
 +N:    bcm9583*
 +N:    bcm583*
 +N:    bcm113*
 +
  BROADCOM KONA GPIO DRIVER
  M:    Ray Jui <rjui@broadcom.com>
  L:    bcm-kernel-feedback-list@broadcom.com
@@@ -2268,7 -2198,7 +2268,7 @@@ F:      Documentation/filesystems/btrfs.tx
  F:    fs/btrfs/
  
  BTTV VIDEO4LINUX DRIVER
 -M:    Mauro Carvalho Chehab <m.chehab@samsung.com>
 +M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    linux-media@vger.kernel.org
  W:    http://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
@@@ -2378,14 -2308,6 +2378,14 @@@ F:    security/capability.
  F:    security/commoncap.c
  F:    kernel/capability.c
  
 +CC2520 IEEE-802.15.4 RADIO DRIVER
 +M:    Varka Bhadram <varkabhadram@gmail.com>
 +L:    linux-wpan@vger.kernel.org
 +S:    Maintained
 +F:    drivers/net/ieee802154/cc2520.c
 +F:    include/linux/spi/cc2520.h
 +F:    Documentation/devicetree/bindings/net/ieee802154/cc2520.txt
 +
  CELL BROADBAND ENGINE ARCHITECTURE
  M:    Arnd Bergmann <arnd@arndb.de>
  L:    linuxppc-dev@lists.ozlabs.org
@@@ -2567,17 -2489,11 +2567,18 @@@ F:   fs/coda
  F:    include/linux/coda*.h
  F:    include/uapi/linux/coda*.h
  
 +CODA V4L2 MEM2MEM DRIVER
 +M:    Philipp Zabel <p.zabel@pengutronix.de>
 +L:    linux-media@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/media/coda.txt
 +F:    drivers/media/platform/coda/
 +
  COMMON CLK FRAMEWORK
  M:    Mike Turquette <mturquette@linaro.org>
+ M:    Stephen Boyd <sboyd@codeaurora.org>
  L:    linux-kernel@vger.kernel.org
- T:    git git://git.linaro.org/people/mturquette/linux.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git
  S:    Maintained
  F:    drivers/clk/
  X:    drivers/clk/clkdev.c
@@@ -2589,7 -2505,8 +2590,7 @@@ M:      Steve French <sfrench@samba.org
  L:    linux-cifs@vger.kernel.org
  L:    samba-technical@lists.samba.org (moderated for non-subscribers)
  W:    http://linux-cifs.samba.org/
 -Q:    http://patchwork.ozlabs.org/project/linux-cifs-client/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git
 +T:    git git://git.samba.org/sfrench/cifs-2.6.git
  S:    Supported
  F:    Documentation/filesystems/cifs/
  F:    fs/cifs/
@@@ -2666,7 -2583,7 +2667,7 @@@ L:      cgroups@vger.kernel.or
  L:    linux-mm@kvack.org
  S:    Maintained
  F:    mm/memcontrol.c
 -F:    mm/page_cgroup.c
 +F:    mm/swap_cgroup.c
  
  CORETEMP HARDWARE MONITORING DRIVER
  M:    Fenghua Yu <fenghua.yu@intel.com>
@@@ -2716,16 -2633,6 +2717,16 @@@ T:    git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    drivers/cpuidle/cpuidle-big_little.c
  
 +CPUIDLE DRIVER - ARM EXYNOS
 +M:    Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
 +M:    Daniel Lezcano <daniel.lezcano@linaro.org>
 +M:    Kukjin Kim <kgene@kernel.org>
 +L:    linux-pm@vger.kernel.org
 +L:    linux-samsung-soc@vger.kernel.org
 +S:    Supported
 +F:    drivers/cpuidle/cpuidle-exynos.c
 +F:    arch/arm/mach-exynos/pm.c
 +
  CPUIDLE DRIVERS
  M:    Rafael J. Wysocki <rjw@rjwysocki.net>
  M:    Daniel Lezcano <daniel.lezcano@linaro.org>
@@@ -2793,7 -2700,7 +2794,7 @@@ F:      drivers/net/wireless/cw1200
  
  CX18 VIDEO4LINUX DRIVER
  M:    Andy Walls <awalls@md.metrocast.net>
 -L:    ivtv-devel@ivtvdriver.org (moderated for non-subscribers)
 +L:    ivtv-devel@ivtvdriver.org (subscribers-only)
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
  W:    http://linuxtv.org
@@@ -2813,7 -2720,7 +2814,7 @@@ F:      drivers/media/common/cx2341x
  F:    include/media/cx2341x*
  
  CX88 VIDEO4LINUX DRIVER
 -M:    Mauro Carvalho Chehab <m.chehab@samsung.com>
 +M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    linux-media@vger.kernel.org
  W:    http://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
@@@ -2838,13 -2745,6 +2839,13 @@@ W:    http://www.chelsio.co
  S:    Supported
  F:    drivers/net/ethernet/chelsio/cxgb3/
  
 +CXGB3 ISCSI DRIVER (CXGB3I)
 +M:      Karen Xie <kxie@chelsio.com>
 +L:      linux-scsi@vger.kernel.org
 +W:      http://www.chelsio.com
 +S:      Supported
 +F:      drivers/scsi/cxgbi/cxgb3i
 +
  CXGB3 IWARP RNIC DRIVER (IW_CXGB3)
  M:    Steve Wise <swise@chelsio.com>
  L:    linux-rdma@vger.kernel.org
@@@ -2859,13 -2759,6 +2860,13 @@@ W:    http://www.chelsio.co
  S:    Supported
  F:    drivers/net/ethernet/chelsio/cxgb4/
  
 +CXGB4 ISCSI DRIVER (CXGB4I)
 +M:      Karen Xie <kxie@chelsio.com>
 +L:      linux-scsi@vger.kernel.org
 +W:      http://www.chelsio.com
 +S:      Supported
 +F:      drivers/scsi/cxgbi/cxgb4i
 +
  CXGB4 IWARP RNIC DRIVER (IW_CXGB4)
  M:    Steve Wise <swise@chelsio.com>
  L:    linux-rdma@vger.kernel.org
@@@ -2956,10 -2849,11 +2957,10 @@@ F:   Documentation/networking/dmfe.tx
  F:    drivers/net/ethernet/dec/tulip/dmfe.c
  
  DC390/AM53C974 SCSI driver
 -M:    Kurt Garloff <garloff@suse.de>
 -W:    http://www.garloff.de/kurt/linux/dc390/
 -M:    Guennadi Liakhovetski <g.liakhovetski@gmx.de>
 +M:    Hannes Reinecke <hare@suse.de>
 +L:    linux-scsi@vger.kernel.org
  S:    Maintained
 -F:    drivers/scsi/tmscsim.*
 +F:    drivers/scsi/am53c974.c
  
  DC395x SCSI driver
  M:    Oliver Neukum <oliver@neukum.org>
@@@ -3182,8 -3076,7 +3183,8 @@@ Q:      https://patchwork.kernel.org/project
  S:    Maintained
  F:    drivers/dma/
  F:    include/linux/dma*
 -T:    git git://git.infradead.org/users/vkoul/slave-dma.git (slave-dma)
 +F:    Documentation/dmaengine/
 +T:    git git://git.infradead.org/users/vkoul/slave-dma.git
  
  DME1737 HARDWARE MONITOR DRIVER
  M:    Juerg Haefliger <juergh@gmail.com>
@@@ -3300,13 -3193,6 +3301,13 @@@ F:    drivers/gpu/drm/exynos
  F:    include/drm/exynos*
  F:    include/uapi/drm/exynos*
  
 +DRM DRIVERS FOR FREESCALE IMX
 +M:    Philipp Zabel <p.zabel@pengutronix.de>
 +L:    dri-devel@lists.freedesktop.org
 +S:    Maintained
 +F:    drivers/gpu/drm/imx/
 +F:    Documentation/devicetree/bindings/drm/imx/
 +
  DRM DRIVERS FOR NVIDIA TEGRA
  M:    Thierry Reding <thierry.reding@gmail.com>
  M:    Terje Bergström <tbergstrom@nvidia.com>
@@@ -3503,7 -3389,7 +3504,7 @@@ F:      fs/ecryptfs
  EDAC-CORE
  M:    Doug Thompson <dougthompson@xmission.com>
  M:    Borislav Petkov <bp@alien8.de>
 -M:    Mauro Carvalho Chehab <m.chehab@samsung.com>
 +M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    linux-edac@vger.kernel.org
  W:    bluesmoke.sourceforge.net
  S:    Supported
@@@ -3552,7 -3438,7 +3553,7 @@@ S:      Maintaine
  F:    drivers/edac/e7xxx_edac.c
  
  EDAC-GHES
 -M:    Mauro Carvalho Chehab <m.chehab@samsung.com>
 +M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    linux-edac@vger.kernel.org
  W:    bluesmoke.sourceforge.net
  S:    Maintained
@@@ -3580,21 -3466,21 +3581,21 @@@ S:   Maintaine
  F:    drivers/edac/i5000_edac.c
  
  EDAC-I5400
 -M:    Mauro Carvalho Chehab <m.chehab@samsung.com>
 +M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    linux-edac@vger.kernel.org
  W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/i5400_edac.c
  
  EDAC-I7300
 -M:    Mauro Carvalho Chehab <m.chehab@samsung.com>
 +M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    linux-edac@vger.kernel.org
  W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/i7300_edac.c
  
  EDAC-I7CORE
 -M:    Mauro Carvalho Chehab <m.chehab@samsung.com>
 +M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    linux-edac@vger.kernel.org
  W:    bluesmoke.sourceforge.net
  S:    Maintained
@@@ -3637,7 -3523,7 +3638,7 @@@ S:      Maintaine
  F:    drivers/edac/r82600_edac.c
  
  EDAC-SBRIDGE
 -M:    Mauro Carvalho Chehab <m.chehab@samsung.com>
 +M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    linux-edac@vger.kernel.org
  W:    bluesmoke.sourceforge.net
  S:    Maintained
@@@ -3697,7 -3583,7 +3698,7 @@@ S:      Maintaine
  F:    drivers/net/ethernet/ibm/ehea/
  
  EM28XX VIDEO4LINUX DRIVER
 -M:    Mauro Carvalho Chehab <m.chehab@samsung.com>
 +M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    linux-media@vger.kernel.org
  W:    http://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
@@@ -4065,7 -3951,7 +4066,7 @@@ F:      drivers/tty/serial/ucc_uart.
  FREESCALE SOC SOUND DRIVERS
  M:    Timur Tabi <timur@tabi.org>
  M:    Nicolin Chen <nicoleotsuka@gmail.com>
 -M:    Xiubo Li <Li.Xiubo@freescale.com>
 +M:    Xiubo Li <Xiubo.Lee@gmail.com>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  L:    linuxppc-dev@lists.ozlabs.org
  S:    Maintained
@@@ -4255,12 -4141,6 +4256,12 @@@ L:    linux-media@vger.kernel.or
  S:    Maintained
  F:    drivers/media/usb/go7007/
  
 +GOODIX TOUCHSCREEN
 +M:    Bastien Nocera <hadess@hadess.net>
 +L:    linux-input@vger.kernel.org
 +S:    Maintained
 +F:    drivers/input/touchscreen/goodix.c
 +
  GPIO SUBSYSTEM
  M:    Linus Walleij <linus.walleij@linaro.org>
  M:    Alexandre Courbot <gnurou@gmail.com>
@@@ -4682,7 -4562,6 +4683,7 @@@ W:      https://i2c.wiki.kernel.org
  Q:    https://patchwork.ozlabs.org/project/linux-i2c/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git
  S:    Maintained
 +F:    Documentation/devicetree/bindings/i2c/
  F:    Documentation/i2c/
  F:    drivers/i2c/
  F:    include/linux/i2c.h
@@@ -4821,21 -4700,8 +4822,21 @@@ S:    Maintaine
  F:    net/ieee802154/
  F:    net/mac802154/
  F:    drivers/net/ieee802154/
 +F:    include/linux/nl802154.h
 +F:    include/linux/ieee802154.h
 +F:    include/net/nl802154.h
 +F:    include/net/mac802154.h
 +F:    include/net/af_ieee802154.h
 +F:    include/net/cfg802154.h
 +F:    include/net/ieee802154_netdev.h
  F:    Documentation/networking/ieee802154.txt
  
 +IGORPLUG-USB IR RECEIVER
 +M:    Sean Young <sean@mess.org>
 +L:    linux-media@vger.kernel.org
 +S:    Maintained
 +F:    drivers/media/rc/igorplugusb.c
 +
  IGUANAWORKS USB IR TRANSCEIVER
  M:    Sean Young <sean@mess.org>
  L:    linux-media@vger.kernel.org
@@@ -4851,7 -4717,6 +4852,7 @@@ L:      linux-iio@vger.kernel.or
  S:    Maintained
  F:    drivers/iio/
  F:    drivers/staging/iio/
 +F:    include/linux/iio/
  
  IKANOS/ADI EAGLE ADSL USB DRIVER
  M:    Matthieu Castet <castet.matthieu@free.fr>
@@@ -4893,11 -4758,6 +4894,11 @@@ L:    linux-security-module@vger.kernel.or
  S:    Supported
  F:    security/integrity/ima/
  
 +IMGTEC IR DECODER DRIVER
 +M:    James Hogan <james.hogan@imgtec.com>
 +S:    Maintained
 +F:    drivers/media/rc/img-ir/
 +
  IMS TWINTURBO FRAMEBUFFER DRIVER
  L:    linux-fbdev@vger.kernel.org
  S:    Orphan
@@@ -4963,12 -4823,6 +4964,12 @@@ T:    git git://git.kernel.org/pub/scm/lin
  S:    Supported
  F:    drivers/idle/intel_idle.c
  
 +INTEL PSTATE DRIVER
 +M:    Kristen Carlson Accardi <kristen@linux.intel.com>
 +L:    linux-pm@vger.kernel.org
 +S:    Supported
 +F:    drivers/cpufreq/intel_pstate.c
 +
  INTEL FRAMEBUFFER DRIVER (excluding 810 and 815)
  M:    Maik Broemme <mbroemme@plusserver.de>
  L:    linux-fbdev@vger.kernel.org
@@@ -5318,7 -5172,7 +5319,7 @@@ F:      drivers/media/tuners/it913x
  
  IVTV VIDEO4LINUX DRIVER
  M:    Andy Walls <awalls@md.metrocast.net>
 -L:    ivtv-devel@ivtvdriver.org (moderated for non-subscribers)
 +L:    ivtv-devel@ivtvdriver.org (subscribers-only)
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
  W:    http://www.ivtvdriver.org
@@@ -5501,6 -5355,15 +5502,6 @@@ S:     Supporte
  F:    arch/powerpc/include/asm/kvm*
  F:    arch/powerpc/kvm/
  
 -KERNEL VIRTUAL MACHINE For Itanium (KVM/IA64)
 -M:    Xiantao Zhang <xiantao.zhang@intel.com>
 -L:    kvm-ia64@vger.kernel.org
 -W:    http://kvm.qumranet.com
 -S:    Supported
 -F:    Documentation/ia64/kvm.txt
 -F:    arch/ia64/include/asm/kvm*
 -F:    arch/ia64/kvm/
 -
  KERNEL VIRTUAL MACHINE for s390 (KVM/s390)
  M:    Christian Borntraeger <borntraeger@de.ibm.com>
  M:    Cornelia Huck <cornelia.huck@de.ibm.com>
@@@ -6004,11 -5867,6 +6005,11 @@@ M:    Russell King <rmk+kernel@arm.linux.o
  S:    Maintained
  F:    drivers/gpu/drm/armada/
  
 +MARVELL 88E6352 DSA support
 +M:    Guenter Roeck <linux@roeck-us.net>
 +S:    Maintained
 +F:    drivers/net/dsa/mv88e6352.c
 +
  MARVELL GIGABIT ETHERNET DRIVERS (skge/sky2)
  M:    Mirko Lindner <mlindner@marvell.com>
  M:    Stephen Hemminger <stephen@networkplumber.org>
@@@ -6090,7 -5948,7 +6091,7 @@@ S:      Maintaine
  F:    drivers/media/radio/radio-maxiradio*
  
  MEDIA INPUT INFRASTRUCTURE (V4L/DVB)
 -M:    Mauro Carvalho Chehab <m.chehab@samsung.com>
 +M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  P:    LinuxTV.org Project
  L:    linux-media@vger.kernel.org
  W:    http://linuxtv.org
@@@ -6119,13 -5977,10 +6120,13 @@@ W:   http://linuxtv.or
  S:    Odd Fixes
  F:    drivers/media/parport/pms*
  
 -MEGARAID SCSI DRIVERS
 -M:    Neela Syam Kolli <megaraidlinux@lsi.com>
 +MEGARAID SCSI/SAS DRIVERS
 +M:    Kashyap Desai <kashyap.desai@avagotech.com>
 +M:    Sumit Saxena <sumit.saxena@avagotech.com>
 +M:    Uday Lingala <uday.lingala@avagotech.com>
 +L:    megaraidlinux.pdl@avagotech.com
  L:    linux-scsi@vger.kernel.org
 -W:    http://megaraid.lsilogic.com
 +W:    http://www.lsi.com
  S:    Maintained
  F:    Documentation/scsi/megaraid.txt
  F:    drivers/scsi/megaraid.*
@@@ -6248,28 -6103,6 +6249,28 @@@ S:    Supporte
  F:    include/linux/mlx5/
  F:    drivers/infiniband/hw/mlx5/
  
 +MN88472 MEDIA DRIVER
 +M:    Antti Palosaari <crope@iki.fi>
 +L:    linux-media@vger.kernel.org
 +W:    http://linuxtv.org/
 +W:    http://palosaari.fi/linux/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/anttip/media_tree.git
 +S:    Maintained
 +F:    drivers/staging/media/mn88472/
 +F:    drivers/media/dvb-frontends/mn88472.h
 +
 +MN88473 MEDIA DRIVER
 +M:    Antti Palosaari <crope@iki.fi>
 +L:    linux-media@vger.kernel.org
 +W:    http://linuxtv.org/
 +W:    http://palosaari.fi/linux/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/anttip/media_tree.git
 +S:    Maintained
 +F:    drivers/staging/media/mn88473/
 +F:    drivers/media/dvb-frontends/mn88473.h
 +
  MODULE SUPPORT
  M:    Rusty Russell <rusty@rustcorp.com.au>
  S:    Maintained
@@@ -6458,6 -6291,7 +6459,6 @@@ F:      drivers/scsi/g_NCR5380.
  F:    drivers/scsi/g_NCR5380_mmio.c
  F:    drivers/scsi/mac_scsi.*
  F:    drivers/scsi/pas16.*
 -F:    drivers/scsi/sun3_NCR5380.c
  F:    drivers/scsi/sun3_scsi.*
  F:    drivers/scsi/sun3_scsi_vme.c
  F:    drivers/scsi/t128.*
@@@ -6616,8 -6450,19 +6617,8 @@@ L:     netdev@vger.kernel.or
  S:    Maintained
  
  NETWORKING [WIRELESS]
 -M:    "John W. Linville" <linville@tuxdriver.com>
  L:    linux-wireless@vger.kernel.org
  Q:    http://patchwork.kernel.org/project/linux-wireless/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git
 -S:    Maintained
 -F:    net/mac80211/
 -F:    net/rfkill/
 -F:    net/wireless/
 -F:    include/net/ieee80211*
 -F:    include/linux/wireless.h
 -F:    include/uapi/linux/wireless.h
 -F:    include/net/iw_handler.h
 -F:    drivers/net/wireless/
  
  NETWORKING DRIVERS
  L:    netdev@vger.kernel.org
@@@ -6638,14 -6483,6 +6639,14 @@@ F:    include/linux/inetdevice.
  F:    include/uapi/linux/if_*
  F:    include/uapi/linux/netdevice.h
  
 +NETWORKING DRIVERS (WIRELESS)
 +M:    Kalle Valo <kvalo@codeaurora.org>
 +L:    linux-wireless@vger.kernel.org
 +Q:    http://patchwork.kernel.org/project/linux-wireless/list/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git/
 +S:    Maintained
 +F:    drivers/net/wireless/
 +
  NETXEN (1/10) GbE SUPPORT
  M:    Manish Chopra <manish.chopra@qlogic.com>
  M:    Sony Chacko <sony.chacko@qlogic.com>
@@@ -6710,13 -6547,6 +6711,13 @@@ S:    Maintaine
  F:    Documentation/scsi/NinjaSCSI.txt
  F:    drivers/scsi/nsp32*
  
 +NIOS2 ARCHITECTURE
 +M:    Ley Foon Tan <lftan@altera.com>
 +L:    nios2-dev@lists.rocketboards.org (moderated for non-subscribers)
 +T:    git git://git.rocketboards.org/linux-socfpga.git
 +S:    Maintained
 +F:    arch/nios2/
 +
  NTB DRIVER
  M:    Jon Mason <jdmason@kudzu.us>
  M:    Dave Jiang <dave.jiang@intel.com>
@@@ -6757,12 -6587,6 +6758,12 @@@ S:    Supporte
  F:    drivers/gpu/drm/i2c/tda998x_drv.c
  F:    include/drm/i2c/tda998x.h
  
 +NXP TFA9879 DRIVER
 +M:    Peter Rosin <peda@axentia.se>
 +L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    sound/soc/codecs/tfa9879*
 +
  OMAP SUPPORT
  M:    Tony Lindgren <tony@atomide.com>
  L:    linux-omap@vger.kernel.org
@@@ -6773,23 -6597,6 +6774,23 @@@ T:    git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    arch/arm/*omap*/
  F:    drivers/i2c/busses/i2c-omap.c
 +F:    drivers/irqchip/irq-omap-intc.c
 +F:    drivers/mfd/*omap*.c
 +F:    drivers/mfd/menelaus.c
 +F:    drivers/mfd/palmas.c
 +F:    drivers/mfd/tps65217.c
 +F:    drivers/mfd/tps65218.c
 +F:    drivers/mfd/tps65910.c
 +F:    drivers/mfd/twl-core.[ch]
 +F:    drivers/mfd/twl4030*.c
 +F:    drivers/mfd/twl6030*.c
 +F:    drivers/mfd/twl6040*.c
 +F:    drivers/regulator/palmas-regulator*.c
 +F:    drivers/regulator/pbias-regulator.c
 +F:    drivers/regulator/tps65217-regulator.c
 +F:    drivers/regulator/tps65218-regulator.c
 +F:    drivers/regulator/tps65910-regulator.c
 +F:    drivers/regulator/twl-regulator.c
  F:    include/linux/i2c-omap.h
  
  OMAP DEVICE TREE SUPPORT
@@@ -6800,9 -6607,6 +6801,9 @@@ L:      devicetree@vger.kernel.or
  S:    Maintained
  F:    arch/arm/boot/dts/*omap*
  F:    arch/arm/boot/dts/*am3*
 +F:    arch/arm/boot/dts/*am4*
 +F:    arch/arm/boot/dts/*am5*
 +F:    arch/arm/boot/dts/*dra7*
  
  OMAP CLOCK FRAMEWORK SUPPORT
  M:    Paul Walmsley <paul@pwsan.com>
@@@ -6832,14 -6636,6 +6833,14 @@@ L:    linux-omap@vger.kernel.or
  S:    Maintained
  F:    sound/soc/omap/
  
 +OMAP GENERAL PURPOSE MEMORY CONTROLLER SUPPORT
 +M:    Roger Quadros <rogerq@ti.com>
 +M:    Tony Lindgren <tony@atomide.com>
 +L:    linux-omap@vger.kernel.org
 +S:    Maintained
 +F:    drivers/memory/omap-gpmc.c
 +F:    arch/arm/mach-omap2/*gpmc*
 +
  OMAP FRAMEBUFFER SUPPORT
  M:    Tomi Valkeinen <tomi.valkeinen@ti.com>
  L:    linux-fbdev@vger.kernel.org
@@@ -7058,12 -6854,11 +7059,12 @@@ F:   drivers/scsi/osd
  F:    include/scsi/osd_*
  F:    fs/exofs/
  
 -OVERLAYFS FILESYSTEM
 +OVERLAY FILESYSTEM
  M:    Miklos Szeredi <miklos@szeredi.hu>
 -L:    linux-fsdevel@vger.kernel.org
 +L:    linux-unionfs@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git
  S:    Supported
 -F:    fs/overlayfs/*
 +F:    fs/overlayfs/
  F:    Documentation/filesystems/overlayfs.txt
  
  P54 WIRELESS DRIVER
@@@ -7217,16 -7012,6 +7218,16 @@@ S:    Maintaine
  F:    Documentation/devicetree/bindings/pci/xgene-pci.txt
  F:    drivers/pci/host/pci-xgene.c
  
 +PCI DRIVER FOR FREESCALE LAYERSCAPE
 +M:    Minghuan Lian <minghuan.Lian@freescale.com>
 +M:    Mingkai Hu <mingkai.hu@freescale.com>
 +M:    Roy Zang <tie-fei.zang@freescale.com>
 +L:    linuxppc-dev@lists.ozlabs.org
 +L:    linux-pci@vger.kernel.org
 +L:    linux-arm-kernel@lists.infradead.org
 +S:    Maintained
 +F:    drivers/pci/host/*layerscape*
 +
  PCI DRIVER FOR IMX6
  M:    Richard Zhu <r65037@freescale.com>
  M:    Lucas Stach <l.stach@pengutronix.de>
@@@ -7406,13 -7191,7 +7407,13 @@@ PIN CONTROLLER - ATMEL AT9
  M:    Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
 -F:    drivers/pinctrl/pinctrl-at91.c
 +F:    drivers/pinctrl/pinctrl-at91.*
 +
 +PIN CONTROLLER - INTEL
 +M:    Mika Westerberg <mika.westerberg@linux.intel.com>
 +M:    Heikki Krogerus <heikki.krogerus@linux.intel.com>
 +S:    Maintained
 +F:    drivers/pinctrl/intel/
  
  PIN CONTROLLER - RENESAS
  M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
@@@ -8031,13 -7810,6 +8032,13 @@@ F:    drivers/hid/hid-roccat
  F:    include/linux/hid-roccat*
  F:    Documentation/ABI/*/sysfs-driver-hid-roccat*
  
 +ROCKER DRIVER
 +M:    Jiri Pirko <jiri@resnulli.us>
 +M:    Scott Feldman <sfeldma@gmail.com>
 +L:    netdev@vger.kernel.org
 +S:    Supported
 +F:    drivers/net/ethernet/rocker/
 +
  ROCKETPORT DRIVER
  P:    Comtrol Corp.
  W:    http://www.comtrol.com
@@@ -8045,12 -7817,6 +8046,12 @@@ S:    Maintaine
  F:    Documentation/serial/rocket.txt
  F:    drivers/tty/rocket*
  
 +ROCKETPORT EXPRESS/INFINITY DRIVER
 +M:    Kevin Cernekee <cernekee@gmail.com>
 +L:    linux-serial@vger.kernel.org
 +S:    Odd Fixes
 +F:    drivers/tty/serial/rp2.*
 +
  ROSE NETWORK LAYER
  M:    Ralf Baechle <ralf@linux-mips.org>
  L:    linux-hams@vger.kernel.org
@@@ -8091,10 -7857,11 +8092,10 @@@ S:   Maintaine
  F:    drivers/media/dvb-frontends/rtl2832_sdr*
  
  RTL8180 WIRELESS DRIVER
 -M:    "John W. Linville" <linville@tuxdriver.com>
  L:    linux-wireless@vger.kernel.org
  W:    http://wireless.kernel.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
 -S:    Maintained
 +S:    Orphan
  F:    drivers/net/wireless/rtl818x/rtl8180/
  
  RTL8187 WIRELESS DRIVER
@@@ -8211,7 -7978,7 +8212,7 @@@ S:      Odd Fixe
  F:    drivers/media/i2c/saa6588*
  
  SAA7134 VIDEO4LINUX DRIVER
 -M:    Mauro Carvalho Chehab <m.chehab@samsung.com>
 +M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    linux-media@vger.kernel.org
  W:    http://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
@@@ -8669,7 -8436,7 +8670,7 @@@ S:      Maintaine
  F:    drivers/media/radio/si4713/radio-usb-si4713.c
  
  SIANO DVB DRIVER
 -M:    Mauro Carvalho Chehab <m.chehab@samsung.com>
 +M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    linux-media@vger.kernel.org
  W:    http://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
@@@ -8679,14 -8446,6 +8680,14 @@@ F:    drivers/media/usb/siano
  F:    drivers/media/usb/siano/
  F:    drivers/media/mmc/siano/
  
 +SIMPLEFB FB DRIVER
 +M:    Hans de Goede <hdegoede@redhat.com>
 +L:    linux-fbdev@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/video/simple-framebuffer.txt
 +F:    drivers/video/fbdev/simplefb.c
 +F:    include/linux/platform_data/simplefb.h
 +
  SH_VEU V4L2 MEM2MEM DRIVER
  L:    linux-media@vger.kernel.org
  S:    Orphan
@@@ -8888,9 -8647,7 +8889,9 @@@ S:      Maintaine
  F:    drivers/leds/leds-net48xx.c
  
  SOFTLOGIC 6x10 MPEG CODEC
 -M:    Ismael Luceno <ismael.luceno@corp.bluecherry.net>
 +M:    Bluecherry Maintainers <maintainers@bluecherrydvr.com>
 +M:    Andrey Utkin <andrey.utkin@corp.bluecherry.net>
 +M:    Andrey Utkin <andrey.krieger.utkin@gmail.com>
  L:    linux-media@vger.kernel.org
  S:    Supported
  F:    drivers/media/pci/solo6x10/
@@@ -9247,13 -9004,6 +9248,13 @@@ F:    lib/swiotlb.
  F:    arch/*/kernel/pci-swiotlb.c
  F:    include/linux/swiotlb.h
  
 +SWITCHDEV
 +M:    Jiri Pirko <jiri@resnulli.us>
 +L:    netdev@vger.kernel.org
 +S:    Supported
 +F:    net/switchdev/
 +F:    include/net/switchdev.h
 +
  SYNOPSYS ARC ARCHITECTURE
  M:    Vineet Gupta <vgupta@synopsys.com>
  S:    Supported
@@@ -9371,7 -9121,7 +9372,7 @@@ S:      Maintaine
  F:    drivers/media/i2c/tda9840*
  
  TEA5761 TUNER DRIVER
 -M:    Mauro Carvalho Chehab <m.chehab@samsung.com>
 +M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    linux-media@vger.kernel.org
  W:    http://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
@@@ -9379,7 -9129,7 +9380,7 @@@ S:      Odd fixe
  F:    drivers/media/tuners/tea5761.*
  
  TEA5767 TUNER DRIVER
 -M:    Mauro Carvalho Chehab <m.chehab@samsung.com>
 +M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    linux-media@vger.kernel.org
  W:    http://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
@@@ -9510,7 -9260,6 +9511,7 @@@ Q:      https://patchwork.kernel.org/project
  S:    Supported
  F:    drivers/thermal/
  F:    include/linux/thermal.h
 +F:    include/uapi/linux/thermal.h
  F:    include/linux/cpu_cooling.h
  F:    Documentation/devicetree/bindings/thermal/
  
@@@ -9615,7 -9364,7 +9616,7 @@@ F:      include/uapi/linux/tipc*.
  F:    net/tipc/
  
  TILE ARCHITECTURE
 -M:    Chris Metcalf <cmetcalf@tilera.com>
 +M:    Chris Metcalf <cmetcalf@ezchip.com>
  W:    http://www.tilera.com/scm/
  S:    Supported
  F:    arch/tile/
@@@ -9692,7 -9441,7 +9693,7 @@@ F:      include/linux/shmem_fs.
  F:    mm/shmem.c
  
  TM6000 VIDEO4LINUX DRIVER
 -M:    Mauro Carvalho Chehab <m.chehab@samsung.com>
 +M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    linux-media@vger.kernel.org
  W:    http://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
@@@ -10243,13 -9992,13 +10244,13 @@@ L: netdev@vger.kernel.or
  S:    Maintained
  F:    drivers/net/ethernet/via/via-velocity.*
  
 -VIVI VIRTUAL VIDEO DRIVER
 +VIVID VIRTUAL VIDEO DRIVER
  M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
  W:    http://linuxtv.org
  S:    Maintained
 -F:    drivers/media/platform/vivi*
 +F:    drivers/media/platform/vivid/*
  
  VLAN (802.1Q)
  M:    Patrick McHardy <kaber@trash.net>
@@@ -10512,15 -10261,8 +10513,15 @@@ L: linux-edac@vger.kernel.or
  S:    Maintained
  F:    arch/x86/kernel/cpu/mcheck/*
  
 +X86 VDSO
 +M:    Andy Lutomirski <luto@amacapital.net>
 +L:    linux-kernel@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/vdso
 +S:    Maintained
 +F:    arch/x86/vdso/
 +
  XC2028/3028 TUNER DRIVER
 -M:    Mauro Carvalho Chehab <m.chehab@samsung.com>
 +M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    linux-media@vger.kernel.org
  W:    http://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git

diff --combined arch/arm/boot/dts/Makefile
index 6a3d9a6c4497915587d4deceac8829e4736ea3f0,5b31c3f6d8e57803c4858323636364c67f37188c..91bd5bd628576d6da17a10aa87afb52232087d06
--- 1/arch/arm/boot/dts/Makefile
--- 2/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -54,17 -54,8 +54,17 @@@ dtb-$(CONFIG_ARCH_AT91)     += at91-sama5d4
  dtb-$(CONFIG_ARCH_ATLAS6) += atlas6-evb.dtb
  dtb-$(CONFIG_ARCH_AXXIA) += axm5516-amarillo.dtb
  dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb
 -dtb-$(CONFIG_ARCH_BCM_5301X) += bcm4708-netgear-r6250.dtb
 +dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b-plus.dtb
 +dtb-$(CONFIG_ARCH_BCM_5301X) += \
 +      bcm4708-buffalo-wzr-1750dhp.dtb \
 +      bcm4708-netgear-r6250.dtb \
 +      bcm4708-netgear-r6300-v2.dtb \
 +      bcm47081-asus-rt-n18u.dtb \
 +      bcm47081-buffalo-wzr-600dhp2.dtb
  dtb-$(CONFIG_ARCH_BCM_63XX) += bcm963138dvt.dtb
 +dtb-$(CONFIG_ARCH_BCM_CYGNUS) += bcm911360_entphn.dtb \
 +      bcm911360k.dtb \
 +      bcm958300k.dtb
  dtb-$(CONFIG_ARCH_BCM_MOBILE) += bcm28155-ap.dtb \
        bcm21664-garnet.dtb
  dtb-$(CONFIG_ARCH_BERLIN) += \
@@@ -76,9 -67,7 +76,9 @@@ dtb-$(CONFIG_ARCH_BRCMSTB) += 
  dtb-$(CONFIG_ARCH_DAVINCI) += da850-enbw-cmc.dtb \
        da850-evm.dtb
  dtb-$(CONFIG_ARCH_EFM32) += efm32gg-dk3750.dtb
 -dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210-origen.dtb \
 +dtb-$(CONFIG_ARCH_EXYNOS) += exynos3250-monk.dtb \
 +      exynos3250-rinato.dtb \
 +      exynos4210-origen.dtb \
        exynos4210-smdkv310.dtb \
        exynos4210-trats.dtb \
        exynos4210-universal_c210.dtb \
@@@ -92,7 -81,6 +92,7 @@@
        exynos5250-arndale.dtb \
        exynos5250-smdk5250.dtb \
        exynos5250-snow.dtb \
 +      exynos5250-spring.dtb \
        exynos5260-xyref5260.dtb \
        exynos5410-smdk5410.dtb \
        exynos5420-arndale-octa.dtb \
@@@ -116,7 -104,6 +116,7 @@@ dtb-$(CONFIG_MACH_KIRKWOOD) += kirkwood
        kirkwood-d2net.dtb \
        kirkwood-db-88f6281.dtb \
        kirkwood-db-88f6282.dtb \
 +      kirkwood-dir665.dtb \
        kirkwood-dns320.dtb \
        kirkwood-dns325.dtb \
        kirkwood-dockstar.dtb \
@@@ -177,6 -164,9 +177,9 @@@
  dtb-$(CONFIG_ARCH_LPC32XX) += ea3250.dtb phy3250.dtb
  dtb-$(CONFIG_ARCH_MARCO) += marco-evb.dtb
  dtb-$(CONFIG_MACH_MESON6) += meson6-atv1200.dtb
+ dtb-$(CONFIG_ARCH_MMP) += pxa168-aspenite.dtb \
+       pxa910-dkb.dtb \
+       mmp2-brownstone.dtb
  dtb-$(CONFIG_ARCH_MOXART) += moxart-uc7112lx.dtb
  dtb-$(CONFIG_ARCH_MXC) += \
        imx1-ads.dtb \
@@@ -253,7 -243,6 +256,7 @@@
        imx6q-sabrelite.dtb \
        imx6q-sabresd.dtb \
        imx6q-sbc6x.dtb \
 +      imx6q-tbs2910.dtb \
        imx6q-udoo.dtb \
        imx6q-wandboard.dtb \
        imx6q-wandboard-revb1.dtb \
@@@ -264,9 -253,6 +267,9 @@@
        imx6q-tx6q-1110.dtb \
        imx6sl-evk.dtb \
        imx6sx-sdb.dtb \
 +      ls1021a-qds.dtb \
 +      ls1021a-twr.dtb \
 +      vf500-colibri-eval-v3.dtb \
        vf610-colibri-eval-v3.dtb \
        vf610-cosmic.dtb \
        vf610-twr.dtb
@@@ -291,8 -277,7 +294,8 @@@ dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dt
        imx28-m28evk.dtb \
        imx28-sps1.dtb \
        imx28-tx28.dtb
 -dtb-$(CONFIG_ARCH_NOMADIK) += ste-nomadik-s8815.dtb
 +dtb-$(CONFIG_ARCH_NOMADIK) += ste-nomadik-s8815.dtb \
 +      ste-nomadik-nhk15.dtb
  dtb-$(CONFIG_ARCH_NSPIRE) += nspire-cx.dtb \
        nspire-tp.dtb \
        nspire-clp.dtb
@@@ -320,9 -305,7 +323,9 @@@ dtb-$(CONFIG_ARCH_OMAP3) += am3517-cran
        omap3-ha.dtb \
        omap3-ha-lcd.dtb \
        omap3-igep0020.dtb \
 +      omap3-igep0020-rev-f.dtb \
        omap3-igep0030.dtb \
 +      omap3-igep0030-rev-g.dtb \
        omap3-ldp.dtb \
        omap3-lilly-dbb056.dtb \
        omap3-n900.dtb \
@@@ -351,8 -334,7 +354,8 @@@ dtb-$(CONFIG_SOC_AM33XX) += am335x-base
        am335x-evm.dtb \
        am335x-evmsk.dtb \
        am335x-nano.dtb \
 -      am335x-pepper.dtb
 +      am335x-pepper.dtb \
 +      am335x-lxm.dtb
  dtb-$(CONFIG_ARCH_OMAP4) += omap4-duovero-parlor.dtb \
        omap4-panda.dtb \
        omap4-panda-a4.dtb \
@@@ -368,7 -350,6 +371,7 @@@ dtb-$(CONFIG_SOC_OMAP5) += omap5-cm-t54
        omap5-sbc-t54.dtb \
        omap5-uevm.dtb
  dtb-$(CONFIG_SOC_DRA7XX) += dra7-evm.dtb \
 +      am57xx-beagle-x15.dtb \
        dra72-evm.dtb
  dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-d2-network.dtb \
        orion5x-lacie-ethernet-disk-mini-v2.dtb \
@@@ -385,10 -366,8 +388,10 @@@ dtb-$(CONFIG_ARCH_QCOM) += 
        qcom-msm8660-surf.dtb \
        qcom-msm8960-cdp.dtb \
        qcom-msm8974-sony-xperia-honami.dtb
 +dtb-$(CONFIG_ARCH_REALVIEW) += arm-realview-pb1176.dtb
  dtb-$(CONFIG_ARCH_ROCKCHIP) += \
        rk3066a-bqcurie2.dtb \
 +      rk3066a-marsboard.dtb \
        rk3188-radxarock.dtb \
        rk3288-evb-act8846.dtb \
        rk3288-evb-rk808.dtb
@@@ -400,27 -379,27 +403,27 @@@ dtb-$(CONFIG_ARCH_S5PV210) += s5pv210-a
        s5pv210-smdkc110.dtb \
        s5pv210-smdkv210.dtb \
        s5pv210-torbreck.dtb
 -dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += r7s72100-genmai.dtb \
 +dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += \
 +      r8a73a4-ape6evm.dtb \
 +      r8a73a4-ape6evm-reference.dtb \
        r8a7740-armadillo800eva.dtb \
        r8a7778-bockw.dtb \
        r8a7778-bockw-reference.dtb \
        r8a7779-marzen.dtb \
 -      r8a7791-koelsch.dtb \
        r8a7790-lager.dtb \
 +      sh7372-mackerel.dtb \
        sh73a0-kzm9g.dtb \
 -      sh73a0-kzm9g-reference.dtb \
 -      r8a73a4-ape6evm.dtb \
 -      r8a73a4-ape6evm-reference.dtb \
 -      sh7372-mackerel.dtb
 +      sh73a0-kzm9g-reference.dtb
  dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d.dtb \
        r7s72100-genmai.dtb \
        r8a7740-armadillo800eva.dtb \
 +      r8a7779-marzen.dtb \
 +      r8a7790-lager.dtb \
        r8a7791-henninger.dtb \
        r8a7791-koelsch.dtb \
 -      r8a7790-lager.dtb \
 -      r8a7779-marzen.dtb \
        r8a7794-alt.dtb
  dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_arria5_socdk.dtb \
 +      socfpga_arria10_socdk.dtb \
        socfpga_cyclone5_socdk.dtb \
        socfpga_cyclone5_sockit.dtb \
        socfpga_cyclone5_socrates.dtb \
@@@ -433,7 -412,6 +436,7 @@@ dtb-$(CONFIG_ARCH_SPEAR3XX)+= spear300-
        spear320-hmi.dtb
  dtb-$(CONFIG_ARCH_SPEAR6XX)+= spear600-evb.dtb
  dtb-$(CONFIG_ARCH_STI)+= stih407-b2120.dtb \
 +      stih410-b2120.dtb \
        stih415-b2000.dtb \
        stih415-b2020.dtb \
        stih416-b2000.dtb \
@@@ -460,20 -438,15 +463,20 @@@ dtb-$(CONFIG_MACH_SUN6I) += 
        sun6i-a31-hummingbird.dtb \
        sun6i-a31-m9.dtb
  dtb-$(CONFIG_MACH_SUN7I) += \
 +      sun7i-a20-bananapi.dtb \
        sun7i-a20-cubieboard2.dtb \
        sun7i-a20-cubietruck.dtb \
        sun7i-a20-hummingbird.dtb \
        sun7i-a20-i12-tvbox.dtb \
 +      sun7i-a20-m3.dtb \
        sun7i-a20-olinuxino-lime.dtb \
 +      sun7i-a20-olinuxino-lime2.dtb \
        sun7i-a20-olinuxino-micro.dtb \
        sun7i-a20-pcduino3.dtb
  dtb-$(CONFIG_MACH_SUN8I) += \
        sun8i-a23-ippo-q8h-v5.dtb
 +dtb-$(CONFIG_MACH_SUN9I) += \
 +      sun9i-a80-optimus.dtb
  dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
        tegra20-iris-512.dtb \
        tegra20-medcom-wide.dtb \
@@@ -519,15 -492,13 +522,15 @@@ dtb-$(CONFIG_ARCH_ZYNQ) += 
        zynq-parallella.dtb \
        zynq-zc702.dtb \
        zynq-zc706.dtb \
 -      zynq-zed.dtb
 +      zynq-zed.dtb \
 +      zynq-zybo.dtb
  dtb-$(CONFIG_MACH_ARMADA_370) += \
        armada-370-db.dtb \
        armada-370-mirabox.dtb \
        armada-370-netgear-rn102.dtb \
        armada-370-netgear-rn104.dtb \
 -      armada-370-rd.dtb
 +      armada-370-rd.dtb \
 +      armada-370-synology-ds213j.dtb
  dtb-$(CONFIG_MACH_ARMADA_375) += \
        armada-375-db.dtb
  dtb-$(CONFIG_MACH_ARMADA_38X) += \
@@@ -540,20 -511,24 +543,20 @@@ dtb-$(CONFIG_MACH_ARMADA_XP) += 
        armada-xp-lenovo-ix4-300d.dtb \
        armada-xp-matrix.dtb \
        armada-xp-netgear-rn2120.dtb \
 -      armada-xp-openblocks-ax3-4.dtb
 +      armada-xp-openblocks-ax3-4.dtb \
 +      armada-xp-synology-ds414.dtb
  dtb-$(CONFIG_MACH_DOVE) += dove-cm-a510.dtb \
        dove-cubox.dtb \
        dove-cubox-es.dtb \
        dove-d2plug.dtb \
        dove-d3plug.dtb \
        dove-dove-db.dtb
 -dtb-$(CONFIG_ARCH_MEDIATEK) += mt6589-aquaris5.dtb
 +dtb-$(CONFIG_ARCH_MEDIATEK) += mt6589-aquaris5.dtb \
 +      mt6592-evb.dtb \
 +      mt8127-moose.dtb \
 +      mt8135-evbp1.dtb
  
 -targets += dtbs dtbs_install
 -targets += $(dtb-y)
  endif
  
 -# *.dtb used to be generated in the directory above. Clean out the
 -# old build results so people don't accidentally use them.
 -dtbs: $(addprefix $(obj)/, $(dtb-y))
 -      $(Q)rm -f $(obj)/../*.dtb
 -
 -clean-files := *.dtb
 -
 -dtbs_install: $(addsuffix _dtbinst_, $(dtb-y))
 +always                := $(dtb-y)
 +clean-files   := *.dtb

diff --combined arch/arm/boot/dts/sun4i-a10.dtsi
index e3ab942fd1488c974824dc05445ad970158dbc5b,5e2ec2dd83339ea39de474e57908709703bdd969..7b4099fcf81788714def505ff009e2b7a4948db2
--- 1/arch/arm/boot/dts/sun4i-a10.dtsi
--- 2/arch/arm/boot/dts/sun4i-a10.dtsi
+++ b/arch/arm/boot/dts/sun4i-a10.dtsi
@@@ -27,20 -27,6 +27,20 @@@
                serial7 = &uart7;
        };
  
 +      chosen {
 +              #address-cells = <1>;
 +              #size-cells = <1>;
 +              ranges;
 +
 +              framebuffer@0 {
 +                      compatible = "allwinner,simple-framebuffer", "simple-framebuffer";
 +                      allwinner,pipeline = "de_be0-lcd0-hdmi";
 +                      clocks = <&pll5 1>, <&ahb_gates 36>, <&ahb_gates 43>,
 +                               <&ahb_gates 44>;
 +                      status = "disabled";
 +              };
 +      };
 +
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;
@@@ -188,19 -174,11 +188,11 @@@
                                "apb0_ir1", "apb0_keypad";
                };
  
-               apb1_mux: apb1_mux@01c20058 {
-                       #clock-cells = <0>;
-                       compatible = "allwinner,sun4i-a10-apb1-mux-clk";
-                       reg = <0x01c20058 0x4>;
-                       clocks = <&osc24M>, <&pll6 1>, <&osc32k>;
-                       clock-output-names = "apb1_mux";
-               };
- 
-               apb1: apb1@01c20058 {
+               apb1: clk@01c20058 {
                        #clock-cells = <0>;
                        compatible = "allwinner,sun4i-a10-apb1-clk";
                        reg = <0x01c20058 0x4>;
-                       clocks = <&apb1_mux>;
+                       clocks = <&osc24M>, <&pll6 1>, <&osc32k>;
                        clock-output-names = "apb1";
                };
  

diff --combined arch/arm/boot/dts/sun5i-a10s.dtsi
index 81ad4b94e812c7f16e1e885cfff7181249d5f61a,d2a85144d2d9d3b8d8b1ad39cb20faa16fb47c50..1b76667f3182694ffb7d055cb8f8e7230809a0bf
--- 1/arch/arm/boot/dts/sun5i-a10s.dtsi
--- 2/arch/arm/boot/dts/sun5i-a10s.dtsi
+++ b/arch/arm/boot/dts/sun5i-a10s.dtsi
@@@ -24,20 -24,6 +24,20 @@@
                serial3 = &uart3;
        };
  
 +      chosen {
 +              #address-cells = <1>;
 +              #size-cells = <1>;
 +              ranges;
 +
 +              framebuffer@0 {
 +                      compatible = "allwinner,simple-framebuffer", "simple-framebuffer";
 +                      allwinner,pipeline = "de_be0-lcd0-hdmi";
 +                      clocks = <&pll5 1>, <&ahb_gates 36>, <&ahb_gates 43>,
 +                               <&ahb_gates 44>;
 +                      status = "disabled";
 +              };
 +      };
 +
        cpus {
                cpu@0 {
                        compatible = "arm,cortex-a8";
@@@ -176,19 -162,11 +176,11 @@@
                                "apb0_ir", "apb0_keypad";
                };
  
-               apb1_mux: apb1_mux@01c20058 {
-                       #clock-cells = <0>;
-                       compatible = "allwinner,sun4i-a10-apb1-mux-clk";
-                       reg = <0x01c20058 0x4>;
-                       clocks = <&osc24M>, <&pll6 1>, <&osc32k>;
-                       clock-output-names = "apb1_mux";
-               };
- 
-               apb1: apb1@01c20058 {
+               apb1: clk@01c20058 {
                        #clock-cells = <0>;
                        compatible = "allwinner,sun4i-a10-apb1-clk";
                        reg = <0x01c20058 0x4>;
-                       clocks = <&apb1_mux>;
+                       clocks = <&osc24M>, <&pll6 1>, <&osc32k>;
                        clock-output-names = "apb1";
                };
  

diff --combined arch/arm/boot/dts/sun6i-a31.dtsi
index a400172a8a52255c6ed7bd4226e3f9ee016d2dfc,4083201e93c8cc3a99f912be7cbcbf630869f7c6..f47156b6572bbaf09872686b70f09268200c3cc9
--- 1/arch/arm/boot/dts/sun6i-a31.dtsi
--- 2/arch/arm/boot/dts/sun6i-a31.dtsi
+++ b/arch/arm/boot/dts/sun6i-a31.dtsi
@@@ -8,18 -8,18 +8,18 @@@
   * licensing only applies to this file, and not this project as a
   * whole.
   *
 - *  a) This library is free software; you can redistribute it and/or
 + *  a) This file is free software; you can redistribute it and/or
   *     modify it under the terms of the GNU General Public License as
   *     published by the Free Software Foundation; either version 2 of the
   *     License, or (at your option) any later version.
   *
 - *     This library is distributed in the hope that it will be useful,
 + *     This file is distributed in the hope that it will be useful,
   *     but WITHOUT ANY WARRANTY; without even the implied warranty of
   *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   *     GNU General Public License for more details.
   *
   *     You should have received a copy of the GNU General Public
 - *     License along with this library; if not, write to the Free
 + *     License along with this file; if not, write to the Free
   *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   *     MA 02110-1301 USA
   *
@@@ -62,18 -62,6 +62,18 @@@
                ethernet0 = &gmac;
        };
  
 +      chosen {
 +              #address-cells = <1>;
 +              #size-cells = <1>;
 +              ranges;
 +
 +              framebuffer@0 {
 +                      compatible = "allwinner,simple-framebuffer", "simple-framebuffer";
 +                      allwinner,pipeline = "de_be0-lcd0-hdmi";
 +                      clocks = <&pll6 0>;
 +                      status = "disabled";
 +              };
 +      };
  
        cpus {
                enable-method = "allwinner,sun6i-a31";
@@@ -144,11 -132,11 +144,11 @@@
                };
  
                pll6: clk@01c20028 {
 -                      #clock-cells = <0>;
 +                      #clock-cells = <1>;
                        compatible = "allwinner,sun6i-a31-pll6-clk";
                        reg = <0x01c20028 0x4>;
                        clocks = <&osc24M>;
 -                      clock-output-names = "pll6";
 +                      clock-output-names = "pll6", "pll6x2";
                };
  
                cpu: cpu@01c20050 {
@@@ -178,7 -166,7 +178,7 @@@
                        #clock-cells = <0>;
                        compatible = "allwinner,sun6i-a31-ahb1-mux-clk";
                        reg = <0x01c20054 0x4>;
 -                      clocks = <&osc32k>, <&osc24M>, <&axi>, <&pll6>;
 +                      clocks = <&osc32k>, <&osc24M>, <&axi>, <&pll6 0>;
                        clock-output-names = "ahb1_mux";
                };
  
@@@ -229,19 -217,11 +229,11 @@@
                                        "apb1_daudio1";
                };
  
-               apb2_mux: apb2_mux@01c20058 {
+               apb2: clk@01c20058 {
                        #clock-cells = <0>;
-                       compatible = "allwinner,sun4i-a10-apb1-mux-clk";
+                       compatible = "allwinner,sun4i-a10-apb1-clk";
                        reg = <0x01c20058 0x4>;
 -                      clocks = <&osc32k>, <&osc24M>, <&pll6>, <&pll6>;
 +                      clocks = <&osc32k>, <&osc24M>, <&pll6 0>, <&pll6 0>;
-                       clock-output-names = "apb2_mux";
-               };
- 
-               apb2: apb2@01c20058 {
-                       #clock-cells = <0>;
-                       compatible = "allwinner,sun6i-a31-apb2-div-clk";
-                       reg = <0x01c20058 0x4>;
-                       clocks = <&apb2_mux>;
                        clock-output-names = "apb2";
                };
  
@@@ -260,7 -240,7 +252,7 @@@
                        #clock-cells = <0>;
                        compatible = "allwinner,sun4i-a10-mod0-clk";
                        reg = <0x01c20088 0x4>;
 -                      clocks = <&osc24M>, <&pll6>;
 +                      clocks = <&osc24M>, <&pll6 0>;
                        clock-output-names = "mmc0";
                };
  
@@@ -268,7 -248,7 +260,7 @@@
                        #clock-cells = <0>;
                        compatible = "allwinner,sun4i-a10-mod0-clk";
                        reg = <0x01c2008c 0x4>;
 -                      clocks = <&osc24M>, <&pll6>;
 +                      clocks = <&osc24M>, <&pll6 0>;
                        clock-output-names = "mmc1";
                };
  
@@@ -276,7 -256,7 +268,7 @@@
                        #clock-cells = <0>;
                        compatible = "allwinner,sun4i-a10-mod0-clk";
                        reg = <0x01c20090 0x4>;
 -                      clocks = <&osc24M>, <&pll6>;
 +                      clocks = <&osc24M>, <&pll6 0>;
                        clock-output-names = "mmc2";
                };
  
@@@ -284,7 -264,7 +276,7 @@@
                        #clock-cells = <0>;
                        compatible = "allwinner,sun4i-a10-mod0-clk";
                        reg = <0x01c20094 0x4>;
 -                      clocks = <&osc24M>, <&pll6>;
 +                      clocks = <&osc24M>, <&pll6 0>;
                        clock-output-names = "mmc3";
                };
  
@@@ -292,7 -272,7 +284,7 @@@
                        #clock-cells = <0>;
                        compatible = "allwinner,sun4i-a10-mod0-clk";
                        reg = <0x01c200a0 0x4>;
 -                      clocks = <&osc24M>, <&pll6>;
 +                      clocks = <&osc24M>, <&pll6 0>;
                        clock-output-names = "spi0";
                };
  
@@@ -300,7 -280,7 +292,7 @@@
                        #clock-cells = <0>;
                        compatible = "allwinner,sun4i-a10-mod0-clk";
                        reg = <0x01c200a4 0x4>;
 -                      clocks = <&osc24M>, <&pll6>;
 +                      clocks = <&osc24M>, <&pll6 0>;
                        clock-output-names = "spi1";
                };
  
@@@ -308,7 -288,7 +300,7 @@@
                        #clock-cells = <0>;
                        compatible = "allwinner,sun4i-a10-mod0-clk";
                        reg = <0x01c200a8 0x4>;
 -                      clocks = <&osc24M>, <&pll6>;
 +                      clocks = <&osc24M>, <&pll6 0>;
                        clock-output-names = "spi2";
                };
  
@@@ -316,7 -296,7 +308,7 @@@
                        #clock-cells = <0>;
                        compatible = "allwinner,sun4i-a10-mod0-clk";
                        reg = <0x01c200ac 0x4>;
 -                      clocks = <&osc24M>, <&pll6>;
 +                      clocks = <&osc24M>, <&pll6 0>;
                        clock-output-names = "spi3";
                };
  
@@@ -373,10 -353,6 +365,10 @@@
                        clocks = <&ahb1_gates 6>;
                        resets = <&ahb1_rst 6>;
                        #dma-cells = <1>;
 +
 +                      /* DMA controller requires AHB1 clocked from PLL6 */
 +                      assigned-clocks = <&ahb1_mux>;
 +                      assigned-clock-parents = <&pll6 0>;
                };
  
                mmc0: mmc@01c0f000 {
@@@ -856,7 -832,7 +848,7 @@@
                        ar100: ar100_clk {
                                compatible = "allwinner,sun6i-a31-ar100-clk";
                                #clock-cells = <0>;
 -                              clocks = <&osc32k>, <&osc24M>, <&pll6>, <&pll6>;
 +                              clocks = <&osc32k>, <&osc24M>, <&pll6 0>, <&pll6 0>;
                                clock-output-names = "ar100";
                        };
  

diff --combined arch/arm/boot/dts/sun7i-a20.dtsi
index 82a524ce28ad1502c5aee93accdb649aeede8821,6d996c9e282a6862b32b7a7ce31e5dd11e7157fc..e21ce5992d565c348ae3b798ad232cd8f6c16c6b
--- 1/arch/arm/boot/dts/sun7i-a20.dtsi
--- 2/arch/arm/boot/dts/sun7i-a20.dtsi
+++ b/arch/arm/boot/dts/sun7i-a20.dtsi
@@@ -8,18 -8,18 +8,18 @@@
   * licensing only applies to this file, and not this project as a
   * whole.
   *
 - *  a) This library is free software; you can redistribute it and/or
 + *  a) This file is free software; you can redistribute it and/or
   *     modify it under the terms of the GNU General Public License as
   *     published by the Free Software Foundation; either version 2 of the
   *     License, or (at your option) any later version.
   *
 - *     This library is distributed in the hope that it will be useful,
 + *     This file is distributed in the hope that it will be useful,
   *     but WITHOUT ANY WARRANTY; without even the implied warranty of
   *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   *     GNU General Public License for more details.
   *
   *     You should have received a copy of the GNU General Public
 - *     License along with this library; if not, write to the Free
 + *     License along with this file; if not, write to the Free
   *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   *     MA 02110-1301 USA
   *
@@@ -64,20 -64,6 +64,20 @@@
                serial7 = &uart7;
        };
  
 +      chosen {
 +              #address-cells = <1>;
 +              #size-cells = <1>;
 +              ranges;
 +
 +              framebuffer@0 {
 +                      compatible = "allwinner,simple-framebuffer", "simple-framebuffer";
 +                      allwinner,pipeline = "de_be0-lcd0-hdmi";
 +                      clocks = <&pll5 1>, <&ahb_gates 36>, <&ahb_gates 43>,
 +                               <&ahb_gates 44>;
 +                      status = "disabled";
 +              };
 +      };
 +
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;
@@@ -236,19 -222,11 +236,11 @@@
                                "apb0_iis2", "apb0_keypad";
                };
  
-               apb1_mux: apb1_mux@01c20058 {
-                       #clock-cells = <0>;
-                       compatible = "allwinner,sun4i-a10-apb1-mux-clk";
-                       reg = <0x01c20058 0x4>;
-                       clocks = <&osc24M>, <&pll6 1>, <&osc32k>;
-                       clock-output-names = "apb1_mux";
-               };
- 
-               apb1: apb1@01c20058 {
+               apb1: clk@01c20058 {
                        #clock-cells = <0>;
                        compatible = "allwinner,sun4i-a10-apb1-clk";
                        reg = <0x01c20058 0x4>;
-                       clocks = <&apb1_mux>;
+                       clocks = <&osc24M>, <&pll6 1>, <&osc32k>;
                        clock-output-names = "apb1";
                };
  
@@@ -566,8 -544,8 +558,8 @@@
                        reg-names = "phy_ctrl", "pmu1", "pmu2";
                        clocks = <&usb_clk 8>;
                        clock-names = "usb_phy";
 -                      resets = <&usb_clk 1>, <&usb_clk 2>;
 -                      reset-names = "usb1_reset", "usb2_reset";
 +                      resets = <&usb_clk 0>, <&usb_clk 1>, <&usb_clk 2>;
 +                      reset-names = "usb0_reset", "usb1_reset", "usb2_reset";
                        status = "disabled";
                };
  
@@@ -691,13 -669,6 +683,13 @@@
                                allwinner,pull = <0>;
                        };
  
 +                      uart3_pins_b: uart3@1 {
 +                              allwinner,pins = "PH0", "PH1";
 +                              allwinner,function = "uart3";
 +                              allwinner,drive = <0>;
 +                              allwinner,pull = <0>;
 +                      };
 +
                        uart4_pins_a: uart4@0 {
                                allwinner,pins = "PG10", "PG11";
                                allwinner,function = "uart4";
@@@ -805,13 -776,6 +797,13 @@@
                                allwinner,pull = <0>;
                        };
  
 +                      spi0_pins_a: spi0@0 {
 +                              allwinner,pins = "PI10", "PI11", "PI12", "PI13", "PI14";
 +                              allwinner,function = "spi0";
 +                              allwinner,drive = <0>;
 +                              allwinner,pull = <0>;
 +                      };
 +
                        spi1_pins_a: spi1@0 {
                                allwinner,pins = "PI16", "PI17", "PI18", "PI19";
                                allwinner,function = "spi1";
@@@ -847,13 -811,6 +839,13 @@@
                                allwinner,pull = <1>;
                        };
  
 +                      mmc2_pins_a: mmc2@0 {
 +                              allwinner,pins = "PC6","PC7","PC8","PC9","PC10","PC11";
 +                              allwinner,function = "mmc2";
 +                              allwinner,drive = <2>;
 +                              allwinner,pull = <1>;
 +                      };
 +
                        mmc3_pins_a: mmc3@0 {
                                allwinner,pins = "PI4","PI5","PI6","PI7","PI8","PI9";
                                allwinner,function = "mmc3";

diff --combined arch/arm/boot/dts/sun8i-a23.dtsi
index 6086adbf9d749adf1fb2040fb76675e84292bab9,701960e9d0333357670ed92aced03838cba2003f..0746cd1024d7a73b32bcbf6002954a4859d77ee5
--- 1/arch/arm/boot/dts/sun8i-a23.dtsi
--- 2/arch/arm/boot/dts/sun8i-a23.dtsi
+++ b/arch/arm/boot/dts/sun8i-a23.dtsi
@@@ -8,18 -8,18 +8,18 @@@
   * licensing only applies to this file, and not this project as a
   * whole.
   *
 - *  a) This library is free software; you can redistribute it and/or
 + *  a) This file is free software; you can redistribute it and/or
   *     modify it under the terms of the GNU General Public License as
   *     published by the Free Software Foundation; either version 2 of the
   *     License, or (at your option) any later version.
   *
 - *     This library is distributed in the hope that it will be useful,
 + *     This file is distributed in the hope that it will be useful,
   *     but WITHOUT ANY WARRANTY; without even the implied warranty of
   *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   *     GNU General Public License for more details.
   *
   *     You should have received a copy of the GNU General Public
 - *     License along with this library; if not, write to the Free
 + *     License along with this file; if not, write to the Free
   *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   *     MA 02110-1301 USA
   *
@@@ -189,19 -189,11 +189,11 @@@
                                        "apb1_daudio0", "apb1_daudio1";
                };
  
-               apb2_mux: apb2_mux_clk@01c20058 {
+               apb2: clk@01c20058 {
                        #clock-cells = <0>;
-                       compatible = "allwinner,sun4i-a10-apb1-mux-clk";
+                       compatible = "allwinner,sun4i-a10-apb1-clk";
                        reg = <0x01c20058 0x4>;
                        clocks = <&osc32k>, <&osc24M>, <&pll6>, <&pll6>;
-                       clock-output-names = "apb2_mux";
-               };
- 
-               apb2: apb2_clk@01c20058 {
-                       #clock-cells = <0>;
-                       compatible = "allwinner,sun6i-a31-apb2-div-clk";
-                       reg = <0x01c20058 0x4>;
-                       clocks = <&apb2_mux>;
                        clock-output-names = "apb2";
                };
  

diff --combined arch/mips/alchemy/common/clock.c
index 203e4403c366869ed1acbd99cbf4e82c92b83942,f42dd0a4af20a060b8b7eca5b2b6fe7e9e1d3251..48a9dfc55b51aa4a3819bae6c686b0cd5f38a7f0
--- 1/arch/mips/alchemy/common/clock.c
--- 2/arch/mips/alchemy/common/clock.c
+++ b/arch/mips/alchemy/common/clock.c
@@@ -37,6 -37,7 +37,6 @@@
  #include <linux/io.h>
  #include <linux/clk-provider.h>
  #include <linux/clkdev.h>
 -#include <linux/clk-private.h>
  #include <linux/slab.h>
  #include <linux/spinlock.h>
  #include <linux/types.h>
@@@ -374,7 -375,7 +374,7 @@@ static long alchemy_calc_div(unsigned l
  
  static long alchemy_clk_fgcs_detr(struct clk_hw *hw, unsigned long rate,
                                        unsigned long *best_parent_rate,
-                                       struct clk **best_parent_clk,
+                                       struct clk_hw **best_parent_clk,
                                        int scale, int maxdiv)
  {
        struct clk *pc, *bpc, *free;
@@@ -396,10 -397,10 +396,10 @@@
                        break;
  
                /* if this parent is currently unused, remember it.
 -               * XXX: I know it's a layering violation, but it works
 -               * so well.. (if (!clk_has_active_children(pc)) )
 +               * XXX: we would actually want clk_has_active_children()
 +               * but this is a good-enough approximation for now.
                 */
 -              if (pc->prepare_count == 0) {
 +              if (!__clk_is_prepared(pc)) {
                        if (!free)
                                free = pc;
                }
@@@ -453,7 -454,7 +453,7 @@@
        }
  
        *best_parent_rate = bpr;
-       *best_parent_clk = bpc;
+       *best_parent_clk = __clk_get_hw(bpc);
        return br;
  }
  
@@@ -547,7 -548,7 +547,7 @@@ static unsigned long alchemy_clk_fgv1_r
  
  static long alchemy_clk_fgv1_detr(struct clk_hw *hw, unsigned long rate,
                                        unsigned long *best_parent_rate,
-                                       struct clk **best_parent_clk)
+                                       struct clk_hw **best_parent_clk)
  {
        return alchemy_clk_fgcs_detr(hw, rate, best_parent_rate,
                                     best_parent_clk, 2, 512);
@@@ -679,7 -680,7 +679,7 @@@ static unsigned long alchemy_clk_fgv2_r
  
  static long alchemy_clk_fgv2_detr(struct clk_hw *hw, unsigned long rate,
                                        unsigned long *best_parent_rate,
-                                       struct clk **best_parent_clk)
+                                       struct clk_hw **best_parent_clk)
  {
        struct alchemy_fgcs_clk *c = to_fgcs_clk(hw);
        int scale, maxdiv;
@@@ -898,7 -899,7 +898,7 @@@ static int alchemy_clk_csrc_setr(struc
  
  static long alchemy_clk_csrc_detr(struct clk_hw *hw, unsigned long rate,
                                        unsigned long *best_parent_rate,
-                                       struct clk **best_parent_clk)
+                                       struct clk_hw **best_parent_clk)
  {
        struct alchemy_fgcs_clk *c = to_fgcs_clk(hw);
        int scale = c->dt[2] == 3 ? 1 : 2; /* au1300 check */

diff --combined drivers/clk/clk-s2mps11.c
index 87a41038237d64634a2372231ebf08654ea7c1a5,4f98898efd3ce772d5397732672823ded5100289..bfa1e64e267d36a9286d5701069305133b5a092c
--- 1/drivers/clk/clk-s2mps11.c
--- 2/drivers/clk/clk-s2mps11.c
+++ b/drivers/clk/clk-s2mps11.c
@@@ -218,7 -218,7 +218,7 @@@ static int s2mps11_clk_probe(struct pla
        default:
                dev_err(&pdev->dev, "Invalid device type\n");
                return -EINVAL;
-       };
+       }
  
        /* Store clocks of_node in first element of s2mps11_clks array */
        s2mps11_clks->clk_np = s2mps11_clk_parse_dt(pdev, clks_init);
@@@ -312,6 -312,7 +312,6 @@@ MODULE_DEVICE_TABLE(platform, s2mps11_c
  static struct platform_driver s2mps11_clk_driver = {
        .driver = {
                .name  = "s2mps11-clk",
 -              .owner = THIS_MODULE,
        },
        .probe = s2mps11_clk_probe,
        .remove = s2mps11_clk_remove,

diff --combined drivers/clk/samsung/clk-exynos-audss.c
index acce708ace18e02997a004aebd6b2b0fee17ef20,f7eff82738abe61782f88b6d4f5b715533701f52..f2c2ccce49bb1ad00f7502e9d4e4236fc6bcbe54
--- 1/drivers/clk/samsung/clk-exynos-audss.c
--- 2/drivers/clk/samsung/clk-exynos-audss.c
+++ b/drivers/clk/samsung/clk-exynos-audss.c
@@@ -29,6 -29,13 +29,13 @@@ static DEFINE_SPINLOCK(lock)
  static struct clk **clk_table;
  static void __iomem *reg_base;
  static struct clk_onecell_data clk_data;
+ /*
+  * On Exynos5420 this will be a clock which has to be enabled before any
+  * access to audss registers. Typically a child of EPLL.
+  *
+  * On other platforms this will be -ENODEV.
+  */
+ static struct clk *epll;
  
  #define ASS_CLK_SRC 0x0
  #define ASS_CLK_DIV 0x4
@@@ -98,6 -105,8 +105,8 @@@ static int exynos_audss_clk_probe(struc
                dev_err(&pdev->dev, "failed to map audss registers\n");
                return PTR_ERR(reg_base);
        }
+       /* EPLL don't have to be enabled for boards other than Exynos5420 */
+       epll = ERR_PTR(-ENODEV);
  
        clk_table = devm_kzalloc(&pdev->dev,
                                sizeof(struct clk *) * EXYNOS_AUDSS_MAX_CLKS,
@@@ -115,8 -124,20 +124,20 @@@
        pll_in = devm_clk_get(&pdev->dev, "pll_in");
        if (!IS_ERR(pll_ref))
                mout_audss_p[0] = __clk_get_name(pll_ref);
-       if (!IS_ERR(pll_in))
+       if (!IS_ERR(pll_in)) {
                mout_audss_p[1] = __clk_get_name(pll_in);
+ 
+               if (variant == TYPE_EXYNOS5420) {
+                       epll = pll_in;
+ 
+                       ret = clk_prepare_enable(epll);
+                       if (ret) {
+                               dev_err(&pdev->dev,
+                                               "failed to prepare the epll clock\n");
+                               return ret;
+                       }
+               }
+       }
        clk_table[EXYNOS_MOUT_AUDSS] = clk_register_mux(NULL, "mout_audss",
                                mout_audss_p, ARRAY_SIZE(mout_audss_p),
                                CLK_SET_RATE_NO_REPARENT,
@@@ -203,6 -224,9 +224,9 @@@ unregister
                        clk_unregister(clk_table[i]);
        }
  
+       if (!IS_ERR(epll))
+               clk_disable_unprepare(epll);
+ 
        return ret;
  }
  
@@@ -210,6 -234,10 +234,10 @@@ static int exynos_audss_clk_remove(stru
  {
        int i;
  
+ #ifdef CONFIG_PM_SLEEP
+       unregister_syscore_ops(&exynos_audss_clk_syscore_ops);
+ #endif
+ 
        of_clk_del_provider(pdev->dev.of_node);
  
        for (i = 0; i < clk_data.clk_num; i++) {
@@@ -217,12 -245,16 +245,15 @@@
                        clk_unregister(clk_table[i]);
        }
  
+       if (!IS_ERR(epll))
+               clk_disable_unprepare(epll);
+ 
        return 0;
  }
  
  static struct platform_driver exynos_audss_clk_driver = {
        .driver = {
                .name = "exynos-audss-clk",
 -              .owner = THIS_MODULE,
                .of_match_table = exynos_audss_clk_of_match,
        },
        .probe = exynos_audss_clk_probe,