Merge tag 'arm-imx-defconfig' of git://git.pengutronix.de/git/imx/linux-2.6 into...
authorOlof Johansson <olof@lixom.net>
Tue, 12 Feb 2013 23:08:25 +0000 (15:08 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 12 Feb 2013 23:08:53 +0000 (15:08 -0800)
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>

Trivial merge