• Linus Torvalds's avatar
    Merge branch 'next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc · dd58ecba
    Linus Torvalds authored
    * 'next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc: (35 commits)
      ARM: msm: platsmp: determine number of CPU cores at boot time
      ARM: Tegra: Seaboard: Fix I2C bus numbering for ADT7461
      ARM: Tegra: Trimslice: Tri-state DAP3 pinmux
      ARM: orion5x: fixup 5181 MPP mask check
      ARM: mxs-dma: include <linux/dmaengine.h>
      ARM: i.MX53: consistently use MX53_UART_PAD_CTRL for uart txd/rxd/rts/cts
      ARM: i.MX53: UARTn_CTS pin should not change RTS input select
      ARM: i.MX53: UARTn_TXD pin should not change RXD input select
      ARM: mx25: Fix typo on CAN1_RX pad setting
      iomux-mx53: add missing 'IOMUX_CONFIG_SION' for some I2C pad definitions
      ARM: NUC93X: add UL suffix to VMALLOC_END to ensure it is properly typed
      ARM: LPC32XXX: add UL suffix to VMALLOC_END to ensure it is properly typed
      ARM: CNS3XXX: add UL suffix to VMALLOC_END to ensure it is properly typed
      ARM: i.MX53: Fix IOMUX type o's
      ARM i.MX dma: Fix burstsize settings
      mach-mx5: fix the I2C clock parents
      ARM: mxs/tx28: according to the TX28's datasheet D4-D7 are not used for MMC0
      ARM i.MX23/28: platform-mxsfb: Add missing include of linux/dma-mapping.h
      ARM: mx53: Fix some interrupts marked as reserved.
      MXC: iomux-v3: correct NO_PAD_CTRL definition
      ...
    
    Fix up trivial conflict in arch/arm/mach-imx/mach-mx31_3ds.c
    dd58ecba
mach-mx31_3ds.c 19.9 KB