Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 15 Feb 2011 23:25:11 +0000 (15:25 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 15 Feb 2011 23:25:11 +0000 (15:25 -0800)
commitc612cc211d7f3ba4c4626d55166b3103d15efd76
treedce92aca3a8ec99c3e774c09080bdbd704aaef3f
parenta7d6e4ecdb7648478ddec76d30d87d03d6e22b31
parenta628e7b87e100befac9702aa0c3b9848a7685e49
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:
  pci: use security_capable() when checking capablities during config space read