diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-07 20:49:16 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-07 20:49:16 +0900 |
| commit | 84424026c0a910886064049d414a12a4f4dd125e (patch) | |
| tree | 62b45188195187acafc08c8ac353cfe399c6c1b1 /security/apparmor | |
| parent | 0b8e74c6f44094189dbe78baf4101acc7570c6af (diff) | |
| parent | 3536c27c0fbe41f731ab6f61217ef95d0bdf2e05 (diff) | |
| download | talos-op-linux-84424026c0a910886064049d414a12a4f4dd125e.tar.gz talos-op-linux-84424026c0a910886064049d414a12a4f4dd125e.zip | |
Merge tag 'defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM soc defconfig updates from Olof Johansson:
"This might be the last time we do a standalone defconfig branch, since
we now prefer to get them with the rest of the subarch updates
instead. These add a handful of useful options on various platforms,
enable new boards and SoCs, etc."
* tag 'defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM: tegra: defconfig updates
ARM: LPC32xx: Defconfig update
ARM: mach-shmobile: marzen: defconfig update
ARM: mxs_defconfig: Add SPI and LRADC support
ARM: s3c6400_defconfig: enable more boards in defconfig
ARM: imx_v6_v7_defconfig: Remove CONFIG_DEFAULT_MMAP_MIN_ADDR
ARM: imx_v6_v7_defconfig: Add Chipidea USB driver support
ARM: mxs_defconfig: Add framebuffer support
ARM: mxs_defconfig: Add LED, PWM and MTD_CHAR support
ARM: mxs_defconfig: Enable USB host
Diffstat (limited to 'security/apparmor')
0 files changed, 0 insertions, 0 deletions
