| commit | c612cc211d7f3ba4c4626d55166b3103d15efd76 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Feb 15 15:25:11 2011 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Feb 15 15:25:11 2011 -0800 |
| tree | dce92aca3a8ec99c3e774c09080bdbd704aaef3f | |
| parent | a7d6e4ecdb7648478ddec76d30d87d03d6e22b31 [diff] | |
| parent | a628e7b87e100befac9702aa0c3b9848a7685e49 [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: pci: use security_capable() when checking capablities during config space read