summaryrefslogtreecommitdiffstats
path: root/security/apparmor
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-03-15 13:57:18 -0700
committerDavid S. Miller <davem@davemloft.net>2011-03-15 13:57:18 -0700
commit918690f9811029667eaf132dbfeb180c6e4e2029 (patch)
tree7bcefc7484e88090eba789b3b6a52e17a83a2f55 /security/apparmor
parent31111c26d976ca0f298312f08e44cdb078005b03 (diff)
parent106af2c99a5249b809aaed45b8353ac087821f4a (diff)
downloadop-kernel-dev-918690f9811029667eaf132dbfeb180c6e4e2029.zip
op-kernel-dev-918690f9811029667eaf132dbfeb180c6e4e2029.tar.gz
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'security/apparmor')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud