diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-11-24 06:34:46 (GMT) |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-11-24 06:34:46 (GMT) |
commit | c4d73e7d75a54451d6e073c118ba2b8d87bd350d (patch) | |
tree | 70bd8009c65558e0ce0b833f7d56b3a0d5febd99 /kernel/auditfilter.c | |
parent | 0421860a5a75b59a76b7a864a172eb090e3d0785 (diff) | |
parent | fd34f85832550d419e8b70f284ad545cdde0664f (diff) | |
parent | 421b446abeec55bed1251fab80cb5c12be58b773 (diff) | |
download | linux-fsl-qoriq-c4d73e7d75a54451d6e073c118ba2b8d87bd350d.tar.xz |
Merge branches 'rmobile/ag5' and 'rmobile/fsi-despair' into rmobile-latest