summaryrefslogtreecommitdiffstats
path: root/security/apparmor/policy.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-08-29 13:29:35 -0700
committerOlof Johansson <olof@lixom.net>2013-08-29 13:29:35 -0700
commitd6a99de704283fbc8249fde6c4aaf517cf531d31 (patch)
tree6192379795a3e8716cc19571c83d5e8461246c31 /security/apparmor/policy.c
parentbba383eef29da2f5b3d95b8c3e9d0b940291ddef (diff)
parent1e9fec0e40deff9d18e4197b5f5f99f85f5d36a5 (diff)
Merge tag 'samsung-mach-exynos-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into late/all
update mach-exynos v2 for v3.12 - enable ARCH_HAS_BANDGAP for exynos SoCs - always enable PM domains for exynos4x12 - skip C1 cpuidle state for exynos5440 * tag 'samsung-mach-exynos-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: EXYNOS: Skip C1 cpuidle state for exynos5440 ARM: EXYNOS: always enable PM domains support for EXYNOS4X12 ARM: EXYNOS: enable ARCH_HAS_BANDGAP Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'security/apparmor/policy.c')
0 files changed, 0 insertions, 0 deletions