projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4af94f3 defc433)
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)
* '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


Trivial merge
John Crispins staging tree