Merge branch 'next/fixes' of git://git.linaro.org/people/arnd/arm-soc
* '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 ...
Showing
- arch/arm/Kconfig 2 additions, 1 deletionarch/arm/Kconfig
- arch/arm/boot/dts/tegra-harmony.dts 1 addition, 0 deletionsarch/arm/boot/dts/tegra-harmony.dts
- arch/arm/boot/dts/tegra-seaboard.dts 4 additions, 0 deletionsarch/arm/boot/dts/tegra-seaboard.dts
- arch/arm/configs/at91sam9g45_defconfig 214 additions, 0 deletionsarch/arm/configs/at91sam9g45_defconfig
- arch/arm/include/asm/hardware/it8152.h 1 addition, 1 deletionarch/arm/include/asm/hardware/it8152.h
- arch/arm/mach-imx/Kconfig 1 addition, 0 deletionsarch/arm/mach-imx/Kconfig
- arch/arm/mach-imx/mach-mx31_3ds.c 1 addition, 1 deletionarch/arm/mach-imx/mach-mx31_3ds.c
- arch/arm/mach-mmp/Kconfig 1 addition, 1 deletionarch/arm/mach-mmp/Kconfig
- arch/arm/mach-mmp/Makefile 1 addition, 1 deletionarch/arm/mach-mmp/Makefile
- arch/arm/mach-mmp/clock.h 4 additions, 4 deletionsarch/arm/mach-mmp/clock.h
- arch/arm/mach-mmp/common.c 2 additions, 2 deletionsarch/arm/mach-mmp/common.c
- arch/arm/mach-mmp/gplugd.c 1 addition, 1 deletionarch/arm/mach-mmp/gplugd.c
- arch/arm/mach-mmp/include/mach/addr-map.h 8 additions, 2 deletionsarch/arm/mach-mmp/include/mach/addr-map.h
- arch/arm/mach-mmp/include/mach/gpio-pxa.h 1 addition, 1 deletionarch/arm/mach-mmp/include/mach/gpio-pxa.h
- arch/arm/mach-mmp/mmp2.c 2 additions, 1 deletionarch/arm/mach-mmp/mmp2.c
- arch/arm/mach-mx5/pm-imx5.c 12 additions, 3 deletionsarch/arm/mach-mx5/pm-imx5.c
- arch/arm/mach-mxs/clock-mx28.c 1 addition, 1 deletionarch/arm/mach-mxs/clock-mx28.c
- arch/arm/mach-omap2/board-4430sdp.c 1 addition, 1 deletionarch/arm/mach-omap2/board-4430sdp.c
- arch/arm/mach-omap2/irq.c 2 additions, 2 deletionsarch/arm/mach-omap2/irq.c
- arch/arm/mach-pxa/Kconfig 29 additions, 9 deletionsarch/arm/mach-pxa/Kconfig
Loading
Please register or sign in to comment