tag 925eb1dee5afccd0c494c65016c3a294fd0b226e
tagger Arnd Bergmann <arnd@arndb.de> Wed Feb 20 20:29:49 2013 +0000
object f628e3d92465303792d52c98fb0c95bef558f936

arm-soc: board specific changes

These updates are all for board specific code, including

* defconfig updates for shmobile, davinci, bcm2835, imx, omap and tegra
* SD/MMC and I2C support on bcm2835 (Raspberry PI)
* minor updates for PXA
* shmobile updates to GPIO usage in board files
* More things in OMAP board files are moved over to device tree probing
* Better support for audio devices on some OMAP platforms

Conflicts include the omap board-apollon.c file that is removed without
a replacement, and conflicting context in the 4430sdp board file.

commit f628e3d92465303792d52c98fb0c95bef558f936
author Olof Johansson <olof@lixom.net> Tue Feb 12 15:08:25 2013 -0800
committer Olof Johansson <olof@lixom.net> Tue Feb 12 15:08:53 2013 -0800
tree 56d559b26e57f871b2c3be2eab88227595241413
parent 2cb6a0708e6680f0b8e6f3ab6b0a46d1c19d8b39
parent 09de7ee1695f182886360faf9cf66702b5342199

Merge tag 'arm-imx-defconfig' of git://git.pengutronix.de/git/imx/linux-2.6 into next/boards

ARM i.MX defconfig updates for v3.9

- enable VPU support in imx_v4_v5_defconfig to get compile coverage
- enable netfilter support

* tag 'arm-imx-defconfig' of git://git.pengutronix.de/git/imx/linux-2.6:
  ARM: imx_v4_v5_defconfig: Add VPU support
  ARM: imx: configs: enable netfilter support

Signed-off-by: Olof Johansson <olof@lixom.net>