• Linus Torvalds's avatar
    Merge branch 'next/fixes' of git://git.linaro.org/people/arnd/arm-soc · 68e24ba7
    Linus Torvalds authored
    * 'next/fixes' of git://git.linaro.org/people/arnd/arm-soc: (28 commits)
      ARM: pxa/cm-x300: properly set bt_reset pin
      ARM: mmp: rename SHEEVAD to GPLUGD
      ARM: imx: Fix typo 'MACH_MX31_3DS_MXC_NAND_USE_BBT'
      ARM: i.MX28: shift frac value in _CLK_SET_RATE
      plat-mxc: iomux-v3.h: implicitly enable pull-up/down when that's desired
      ARM: mx5: fix clock usage for suspend
      ARM: pxa: use correct __iomem annotations
      ARM: pxa: sharpsl pm needs SPI
      ARM: pxa: centro and treo680 need palm27x
      ARM: pxa: make pxafb_smart_*() empty when not enabled
      ARM: pxa: select POWER_SUPPLY on raumfeld
      ARM: pxa: pxa95x is incompatible with earlier pxa
      ARM: pxa: CPU_FREQ_TABLE is needed for CPU_FREQ
      ARM: pxa: pxa95x/saarb depends on pxa3xx code
      ARM: pxa: allow selecting just one of TREO680/CENTRO
      ARM: pxa: export symbols from pxa3xx-ulpi
      ARM: pxa: make zylonite_pxa*_init declaration match code
      ARM: pxa/z2: fix building error of pxa27x_cpu_suspend() no longer available
      ARM: at91: add defconfig for at91sam9g45 family
      ARM: at91: remove dependency for Atmel PWM driver selector in Kconfig
      ...
    68e24ba7
cm-x300.c 18.8 KB