commit | 48b71e3ac138469e83d044db22020424aaa44753 | [log] [tgz] |
---|---|---|
author | Olof Johansson <olof@lixom.net> | Sun Nov 25 23:31:47 2012 -0800 |
committer | Olof Johansson <olof@lixom.net> | Sun Nov 25 23:31:47 2012 -0800 |
tree | 5fdc072d847bf123b727f4b9e0732bb3a75bec2a | |
parent | 4cf90df38c412d60bae5e37c64602198fcad0ae6 [diff] | |
parent | 5177ae56d1b6dcf4b23f1f89ed3be1c3dc0ad513 [diff] |
Merge tag 'imx-defconfig' of git://git.pengutronix.de/git/imx/linux-2.6 into next/boards From Sascha Hauer: ARM i.MX specific defconfig updates * tag 'imx-defconfig' of git://git.pengutronix.de/git/imx/linux-2.6: ARM: imx: configs: Enable CONFIG_MEDIA_CAMERA_SUPPORT ARM: imx_v6_v7_defconfig: Add DA9052 regulator support