diff options
| author | Olof Johansson <olof@lixom.net> | 2012-03-13 16:10:35 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-03-13 16:10:35 -0700 |
| commit | c77ef898625f558c89c6ca0b27e2032f0fad4196 (patch) | |
| tree | 28584a77d2e2d4345f292a31d47bdf2321df697d /arch/arm/mach-ixp4xx/nas100d-setup.c | |
| parent | c454f813501b94cd687bf3c5c0783f815a854905 (diff) | |
| parent | bae82bdfb1edb2d709bd4ba0bda1ed0bb474f5e1 (diff) | |
| download | blackbird-op-linux-c77ef898625f558c89c6ca0b27e2032f0fad4196.tar.gz blackbird-op-linux-c77ef898625f558c89c6ca0b27e2032f0fad4196.zip | |
Merge branch 'next/board-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/boards
* 'next/board-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: (32 commits)
ARM: EXYNOS: support Exynos4210-bus Devfreq driver on Nuri board
ARM: EXYNOS: Register JPEG on nuri
ARM: EXYNOS: Register JPEG on universal_c210
ARM: S5PV210: Enable JPEG on SMDKV210
ARM: S5PV210: Add JPEG board definition
ARM: EXYNOS: Enable JPEG on Origen
ARM: EXYNOS: Enable JPEG on SMDKV310
ARM: EXYNOS: Add __init attribute to universal_camera_init()
ARM: EXYNOS: Add __init attribute to nuri_camera_init()
ARM: S5PV210: Enable FIMC on SMDKC110
ARM: S5PV210: Enable FIMC on SMDKV210
ARM: S5PV210: Enable MFC on SMDKC110
ARM: S5PV210: Enable MFC on SMDKV210
ARM: EXYNOS: Enable G2D on SMDKV310
ARM: S3C64XX: Supply platform data for SPI on Cragganmore
ARM: S3C64XX: Add some more Cragganmore module IDs to the table
ARM: EXYNOS: Add missing FIMC media device to Origen
ARM: EXYNOS: Add missing FIMC media device to SMDKV310
ARM: S5PV210: Add missing FIMC media device to Aquila
ARM: SAMSUNG: Add support for S5K6AAFX camera on Nuri board
...
Diffstat (limited to 'arch/arm/mach-ixp4xx/nas100d-setup.c')
0 files changed, 0 insertions, 0 deletions
