Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
commit0a6d2fac615972142715d736289abeeb7382e81d
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 1 Nov 2008 16:50:38 +0000 (1 09:50 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 1 Nov 2008 16:50:38 +0000 (1 09:50 -0700)
tree828bd68949a5d4dd3a958c2be215695170b9b29c
parent76f8bef0db031f03bf286c8bbccfaf83f0b22224
parent37dd0bd04a3240d2922786d501e2f12cec858fbf
Merge branch 'for-linus' of git://git./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