Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 18 Apr 2009 18:37:50 +0000 (11:37 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 18 Apr 2009 18:37:50 +0000 (11:37 -0700)
commit62f2730a11b6fbd6ac274dcf1bc8251abe8d2205
tree35ab44ec8f91c16a61dc8dc8ef34b2fcb6723828
parent4af94f39004a0d1a074e7573457e238a29557848
parentdefc433ba3bc587826bb467ce0e63452deafa65d
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:
  Smack: check for SMACK xattr validity in smack_inode_setxattr