diff options
author | Olof Johansson <olof@lixom.net> | 2012-05-19 11:57:36 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-05-19 11:57:36 -0700 |
commit | 0804dcb2afdcf014947ee98264041765f580d43f (patch) | |
tree | 7711bd9db2e31a23880b2d463066de92f0f64a52 /security/smack/smack_lsm.c | |
parent | 19a64d9d591f9d188707e86e53bc0c4ed99ac8f0 (diff) | |
parent | 450cca47d65b7500ba05d56770adbf8c758dc87d (diff) | |
download | blackbird-op-linux-0804dcb2afdcf014947ee98264041765f580d43f.tar.gz blackbird-op-linux-0804dcb2afdcf014947ee98264041765f580d43f.zip |
Merge branch 'emev2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas into next/soc
* 'emev2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas:
mach-shmobile: Use DT_MACHINE for KZM9D V3
mach-shmobile: Emma Mobile EV2 DT support V3
mach-shmobile: KZM9D board Ethernet support V3
mach-shmobile: Emma Mobile EV2 GPIO support V3
mach-shmobile: Emma Mobile EV2 SMP support V3
mach-shmobile: KZM9D board support V3
mach-shmobile: Emma Mobile EV2 SoC base support V3
gpio: Emma Mobile GPIO driver V2
Diffstat (limited to 'security/smack/smack_lsm.c')
0 files changed, 0 insertions, 0 deletions