diff options
author | Olof Johansson <olof@lixom.net> | 2012-11-26 08:31:47 +0100 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-11-26 08:31:47 +0100 |
commit | 48b71e3ac138469e83d044db22020424aaa44753 (patch) | |
tree | 5fdc072d847bf123b727f4b9e0732bb3a75bec2a /kernel/smpboot.c | |
parent | Merge branch 'imx/board' into next/boards (diff) | |
parent | ARM: imx: configs: Enable CONFIG_MEDIA_CAMERA_SUPPORT (diff) | |
download | linux-48b71e3ac138469e83d044db22020424aaa44753.tar.xz linux-48b71e3ac138469e83d044db22020424aaa44753.zip |
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
Diffstat (limited to 'kernel/smpboot.c')
0 files changed, 0 insertions, 0 deletions