tree 54205739d4e65788757882fdda5dbd9687d93966
parent 608221fdf9a2170962295dcfbea53dc5c50d1a74
parent 4c3da2209b1261af9a948b7509a38904c8eee554
author Linus Torvalds <torvalds@linux-foundation.org> 1257447459 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1257447459 -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:
  sysfs: Don't leak secdata when a sysfs_dirent is freed.