diff options
author | Arnd Bergmann <arnd@arndb.de> | 2014-09-05 16:57:40 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2014-09-05 16:57:40 +0200 |
commit | b509b5e40e0a3ce39ced2187fb3ab34d10921080 (patch) | |
tree | 6ad68a4478efed7e90486a34059c9d124ae5e472 /arch/arm/mach-omap2/omap-pm-noop.c | |
parent | aa4f88c812b50d0cf77289fd50a9a4fed6bd4173 (diff) | |
parent | de46e95cdb8671e2b0728923b8113654779c3ba8 (diff) | |
download | blackbird-op-linux-b509b5e40e0a3ce39ced2187fb3ab34d10921080.tar.gz blackbird-op-linux-b509b5e40e0a3ce39ced2187fb3ab34d10921080.zip |
Merge tag 'renesas-defconfig3-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/defconfig
Pull "Renesas ARM Based SoC Defconfig Updates for v3.18" from Simon Horman:
Third Round of Renesas ARM Based SoC Defconfig Updates for v3.18
* Enable Armadillo 800 EVA board in multiplatform defconfig
Second Round Of Renesas ARM Based SoC Defconfig Updates For v3.18
* Do not disable SUSPEND in Bockw defconfig
- Suspend to ram is now supported
Renesas ARM Based SoC Defconfig Updates for v3.18
* Enable initrd in shmobile defconfig
* Enable missing hardware support in shmobile and several board defconfigs
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* tag 'renesas-defconfig3-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: Enable Armadillo 800 EVA board in multiplatform defconfig
ARM: shmobile: bockw: Do not disable SUSPEND in defconfig
ARM: shmobile: defconfig: enable initrd
ARM: shmobile: marzen_defconfig: Enable missing hardware support
ARM: shmobile: lager_defconfig: Enable missing hardware support
ARM: shmobile: kzm9g_defconfig: Enable missing hardware support
ARM: shmobile: koelsch_defconfig: Enable missing hardware support
ARM: shmobile: bockw_defconfig: Enable missing hardware support
ARM: shmobile: ape6evm_defconfig: Enable missing hardware support
ARM: shmobile: shmobile_defconfig: Enable missing hardware support
Diffstat (limited to 'arch/arm/mach-omap2/omap-pm-noop.c')
0 files changed, 0 insertions, 0 deletions