diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-15 18:25:11 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-15 18:25:11 -0500 |
| commit | c612cc211d7f3ba4c4626d55166b3103d15efd76 (patch) | |
| tree | dce92aca3a8ec99c3e774c09080bdbd704aaef3f /drivers/misc/bmp085.c | |
| 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
Diffstat (limited to 'drivers/misc/bmp085.c')
0 files changed, 0 insertions, 0 deletions