• Linus Torvalds's avatar
    Merge tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 1c6ba37b
    Linus Torvalds authored
    Pull ARM SoC bug fixes from Arnd Bergmann:
     "Things are calming down for arm-soc as well.  This set of bug fixes is
      dominated in size by the at91 platform bug fixes.  Some of them were
      meant to go through the framebuffer tree during the merge window, but
      since the framebuffer maintainer could not be reached, I offered to
      take them here.  The other notable at91 change is the addition of
      pinctrl definitions to fix the NAND controller.
    
      The rest are mostly simple regression fixes:
    
       - Our removal of VIRT_TO_BUS conflicted with Stephen Rothwell's
         renaming of the Kconfig symbol.  You will get a trivial merge
         conflict here, we still want to remove it.
       - missing bits for clocks on imx and s5pv210
       - missing header inclusions in mmp and shmobile
       - typos in s5pv210 camera and vt8500 clock support code
    
      and three trivial fixes for pre-3.8 bugs:
    
       - an old bogus build warning in the joystick driver
       - a misleading Kconfig description
       - a NULL pointer check on davinci"
    
    * tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
      ARM: fix CONFIG_VIRT_TO_BUS handling
      ARM: i.MX35: enable MAX clock
      ARM: Scorpion is a v7 architecture, not v6
      ARM: mmp: add platform_device head file in gplugd
      input/joystick: use get_cycles on ARM
      [media] s5p-fimc: fix s5pv210 build
      clk: vt8500: Fix "fix device clock divisor calculations"
      ARM: i.MX25: Fix DT compilation
      ARM: at91: fix infinite loop in at91_irq_suspend/resume
      ARM: at91: add gpio suspend/resume support when using pinctrl
      ARM: at91: fix LCD-wiring mode
      atmel_lcdfb: fix 16-bpp modes on older SOCs
      ARM: at91: dt: at91sam9x5: complete NAND pinctrl
      ARM: at91: dt: at91sam9x5: correct NAND pins comments
      ARM: davinci: edma: fix dmaengine induced null pointer dereference on da830
      ARM: shmobile: marzen: Include mmc/host.h
      ARM: EXYNOS: Add #dma-cells for generic dma binding support for PL330
      ARM: S5PV210: Fix PL330 DMA controller clkdev entries
    1c6ba37b
Kconfig 66.5 KB