summaryrefslogtreecommitdiffstats
path: root/security/keys/process_keys.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-05-25 21:47:48 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-05-25 21:47:48 +0100
commit586893ebc42943008010b4c210cfc9167df615e5 (patch)
treeeec3179235978fba9ca6bfae0799d97c8532ee15 /security/keys/process_keys.c
parent014322dac6ae0048c928c6ca2faf0d53194f9d15 (diff)
parentbd6356bdafc853201168f718f0059fbe11191461 (diff)
downloadtalos-op-linux-586893ebc42943008010b4c210cfc9167df615e5.tar.gz
talos-op-linux-586893ebc42943008010b4c210cfc9167df615e5.zip
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable
Conflicts: arch/arm/Kconfig arch/arm/mach-exynos4/mach-nuri.c
Diffstat (limited to 'security/keys/process_keys.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud