tree 3f3d4b463e28f141a6c1fa880db1257885766e32
parent 96faec945f39cab38403f60f515bff43660b4dab
parent 54d2f649a67109d877ca143c09cdeba61fe51bcf
author Linus Torvalds <torvalds@linux-foundation.org> 1230506108 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1230506108 -0800

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:
  smackfs: check for allocation failures in smk_set_access()