| commit | 5c6cce92bc8aee751aafe82c5d9caf7553226a3d | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jun 01 16:35:37 2011 +0900 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jun 01 16:35:37 2011 +0900 |
| tree | d46ddaa86089148e39ba91ddf58430bb1d235748 | |
| parent | 603d04b2010976a52f62b7633f9999d104046900 [diff] | |
| parent | a5b2c5b2ad5853591a6cac6134cd0f599a720865 [diff] |
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: AppArmor: fix oops in apparmor_setprocattr