tree 828bd68949a5d4dd3a958c2be215695170b9b29c
parent 76f8bef0db031f03bf286c8bbccfaf83f0b22224
parent 37dd0bd04a3240d2922786d501e2f12cec858fbf
author Linus Torvalds <torvalds@linux-foundation.org> 1225558238 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1225558238 -0700

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