Merge tag 'aa-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmo...
authorJames Morris <james.l.morris@oracle.com>
Sun, 12 May 2013 11:28:38 +0000 (21:28 +1000)
committerJames Morris <james.l.morris@oracle.com>
Sun, 12 May 2013 11:28:38 +0000 (21:28 +1000)
commitbd71164abc141ea696014e3e23c561b0d7f1b434
tree3b9c64698800566197bf4ecec604ba8bb1228bd3
parentf722406faae2d073cc1d01063d1123c35425939e
parent2654bfbc2bd0e1e64f0b257c21da23f6cec32c6c
Merge tag 'aa-3.10' of git://git./linux/kernel/git/jj/linux-apparmor into ra-next