Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
commitd4116f820496ae3af5225d09450edc7791df0045
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 5 Nov 2009 18:57:39 +0000 (5 10:57 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 5 Nov 2009 18:57:39 +0000 (5 10:57 -0800)
tree54205739d4e65788757882fdda5dbd9687d93966
parent608221fdf9a2170962295dcfbea53dc5c50d1a74
parent4c3da2209b1261af9a948b7509a38904c8eee554
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:
  sysfs: Don't leak secdata when a sysfs_dirent is freed.