From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 15 Feb 2011 23:25:11 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: v2.6.38-rc5~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c612cc211d7f3ba4c4626d55166b3103d15efd76;p=platform%2Fkernel%2Flinux-3.10.git

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
---

c612cc211d7f3ba4c4626d55166b3103d15efd76