Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 28 Dec 2008 23:15:08 +0000 (15:15 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 28 Dec 2008 23:15:08 +0000 (15:15 -0800)
commitd05a788f2279056a518d412c6391322ef11366e0
tree3f3d4b463e28f141a6c1fa880db1257885766e32
parent96faec945f39cab38403f60f515bff43660b4dab
parent54d2f649a67109d877ca143c09cdeba61fe51bcf
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:
  smackfs: check for allocation failures in smk_set_access()