linux/arch
Linus Torvalds 40e71e7015 ARM SoC board specific changes
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.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQIVAwUAUdLnmmCrR//JCVInAQKNuxAAxXpBslUGRpI8O28KHA3EeL+9HR5wBoKo
 K6q6fQlAv9dcGJOx7fkyHU4UfE1kV+M6l4R9BM8VcjflQjCnG4GrQo8qgJNY14nf
 OpQKSIHEtdBHzFpHEIxogByR1i05hL8nrm21TElgi/aYlDwKbXnApY23ubApPif4
 oXmES9ppXvnz1D7bCE7PaZf+TIgufpPFkioQYcV93nD0x5tYu1mZn2xSfYDekAyU
 mUe1p2oX+77U0lohVQCo1H/ZOJBdoAN1U//2QCiL8YKJitQf/vOVs3QtHEUywIiU
 CyUaDhfM7sX4QKBWzwjxoVOcT6QC/qhaaqaases0gjgjepKaSqUTZMBdLI7oyF3o
 2ExYv8BMGilbIyNUYoxeoqz9zA3IQ7wDxaBh3G1JY9k0/BhKmsEwtGYkSJPdOgpt
 XyX7N/xKzy0lTWf1N4eSWUiccfXdVjLFf3Jp2xA7e/KJfzFAF/RJXdGiV2Kzdr7m
 mZ7ESYRk+S3ENgpI/QI4C6kQ7EBynQjhn5t2+iK9k4gKNspNZ3TjLCQif0v0xE3H
 IIsaSqLBuj9IZ1r13fpQJZIyTr+dHsx2s6QQBFXYzeQ/cjfSRGZP4FmYyweGctfR
 Hh1AAshrOAwNl4ZdXgIT08JKtBocaGFUtt4syvPfAFYoojMN58xg5EG4FYtKpKHp
 xU6w43o6KnQ=
 =7bgc
 -----END PGP SIGNATURE-----

Merge tag 'boards-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

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
  ...
2013-07-02 14:10:26 -07:00
..
alpha TTY/Serial merge for 3.11-rc1 2013-07-02 11:32:06 -07:00
arc consolidate io_remap_pfn_range definitions 2013-06-29 12:46:35 +04:00
arm ARM SoC board specific changes 2013-07-02 14:10:26 -07:00
arm64 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 2013-07-02 09:28:37 -07:00
avr32 consolidate io_remap_pfn_range definitions 2013-06-29 12:46:35 +04:00
blackfin Driver core patches for 3.11-rc1 2013-07-02 11:44:19 -07:00
c6x consolidate io_remap_pfn_range definitions 2013-06-29 12:46:35 +04:00
cris Driver core patches for 3.11-rc1 2013-07-02 11:44:19 -07:00
frv consolidate io_remap_pfn_range definitions 2013-06-29 12:46:35 +04:00
h8300 consolidate io_remap_pfn_range definitions 2013-06-29 12:46:35 +04:00
hexagon consolidate io_remap_pfn_range definitions 2013-06-29 12:46:35 +04:00
ia64 Driver core patches for 3.11-rc1 2013-07-02 11:44:19 -07:00
m32r consolidate io_remap_pfn_range definitions 2013-06-29 12:46:35 +04:00
m68k consolidate io_remap_pfn_range definitions 2013-06-29 12:46:35 +04:00
metag Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 2013-07-02 09:28:37 -07:00
microblaze consolidate io_remap_pfn_range definitions 2013-06-29 12:46:35 +04:00
mips Driver core patches for 3.11-rc1 2013-07-02 11:44:19 -07:00
mn10300 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 2013-07-02 09:28:37 -07:00
openrisc consolidate io_remap_pfn_range definitions 2013-06-29 12:46:35 +04:00
parisc Driver core patches for 3.11-rc1 2013-07-02 11:44:19 -07:00
powerpc Driver core patches for 3.11-rc1 2013-07-02 11:44:19 -07:00
s390 Driver core patches for 3.11-rc1 2013-07-02 11:44:19 -07:00
score consolidate io_remap_pfn_range definitions 2013-06-29 12:46:35 +04:00
sh Driver core patches for 3.11-rc1 2013-07-02 11:44:19 -07:00
sparc Driver core patches for 3.11-rc1 2013-07-02 11:44:19 -07:00
tile Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 2013-07-02 09:28:37 -07:00
um consolidate io_remap_pfn_range definitions 2013-06-29 12:46:35 +04:00
unicore32 consolidate io_remap_pfn_range definitions 2013-06-29 12:46:35 +04:00
x86 Driver core patches for 3.11-rc1 2013-07-02 11:44:19 -07:00
xtensa consolidate io_remap_pfn_range definitions 2013-06-29 12:46:35 +04:00
.gitignore
Kconfig Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2013-05-15 14:04:00 -07:00