diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-01 09:50:38 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-01 09:50:38 -0700 |
commit | 0a6d2fac615972142715d736289abeeb7382e81d (patch) | |
tree | 828bd68949a5d4dd3a958c2be215695170b9b29c /include/asm-cris/arch-v32/mach-fs/hwregs/marb_defs.h | |
parent | 76f8bef0db031f03bf286c8bbccfaf83f0b22224 (diff) | |
parent | 37dd0bd04a3240d2922786d501e2f12cec858fbf (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
SELinux: properly handle empty tty_files list
Diffstat (limited to 'include/asm-cris/arch-v32/mach-fs/hwregs/marb_defs.h')
0 files changed, 0 insertions, 0 deletions