• Linus Torvalds's avatar
    Merge tag 'boards-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 40e71e70
    Linus Torvalds authored
    Pull ARM SoC board specific changes from Arnd Bergmann:
     "These are 18 branches on 9 platforms with board specific changes,
      mostly for defconfig files, but nothing really exciting in here.
    
      Since the shmobile platform still uses board files for some of the
      newer machines, we get a few changes there as the result of drivers
      getting enabled for those boards.  This causes some conflicts with
      contents getting added from multiple branches in sh-mobile specific
      files.  Renesas is putting a lot of work into migrating to device-tree
      based setup, which will make all those files obsolete in the future
      and avoid both the conflicts and the need to have these files in the
      first place."
    
    * tag 'boards-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (49 commits)
      arm: multi_v7_defconfig: Enable initrd/initramfs support
      arm: multi_v7_defconfig: Enable Zynq UART driver
      ARM: omap2plus_defconfig: enable USB_PHY and NOP_USB_XCEIV
      ARM: OMAP1: nokia770: enable Tahvo
      ARM: OMAP3EVM: Marking omap3_evm_display_init() with CONFIG_BROKEN
      arm: omap: board-overo: reset GPIO for SMSC911x
      ARM: shmobile: BOCK-W: change Ether device name
      ARM: ux500: board-mop500: remove unused pin modes
      ARM: shmobile: bockw: add MMCIF support
      ARM: shmobile: bockw: add SPI FLASH support
      ARM: shmobile: bockw: add I2C device support
      ARM: shmobile: BOCK-W: add Ether support
      ARM: tegra: defconfig updates
      ARM: shmobile: bockw defconfig: add MMCIF support
      ARM: shmobile: bockw defconfig: add M25P80 support
      ARM: shmobile: bockw defconfig: add RTC RX8581 support
      ARM: shmobile: marzen: keep local function as static
      ARM: shmobile: bockw: add SDHI0 support
      ARM: shmobile: marzen: Use INTC External IRQ pin driver for SMSC
      ARM: shmobile: lager: support GPIO switches
      ...
    40e71e70
common.h 4.54 KB