summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorJames Morris <james.l.morris@oracle.com>2012-03-15 14:43:02 +1100
committerJames Morris <james.l.morris@oracle.com>2012-03-15 14:43:02 +1100
commitb01d3fb921df9baef1ecd13704f4b1e269b58b6b (patch)
tree1ca714b40774cd56c0194abee5c6577b2ba6aad2 /block
parent6041e8346f2165679c2184cab60db768d6a26a1d (diff)
parent2d4cee7e3a2b9f9c3237672cc136e20dbad0e2ce (diff)
downloadlinux-b01d3fb921df9baef1ecd13704f4b1e269b58b6b.tar.gz
linux-b01d3fb921df9baef1ecd13704f4b1e269b58b6b.tar.bz2
linux-b01d3fb921df9baef1ecd13704f4b1e269b58b6b.zip
Merge branch 'for-security' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor into next
Diffstat (limited to 'block')
0 files changed, 0 insertions, 0 deletions