diff options
author | James Morris <james.l.morris@oracle.com> | 2012-05-22 01:21:06 (GMT) |
---|---|---|
committer | James Morris <james.l.morris@oracle.com> | 2012-05-22 01:21:06 (GMT) |
commit | ff2bb047c4bce9742e94911eeb44b4d6ff4734ab (patch) | |
tree | 9d9b1cfa3fc17f0cc13f34ca697306cb1f46b05f /fs/btrfs/ioctl.h | |
parent | cffee16e8b997ab947de661e8820e486b0830c94 (diff) | |
parent | c737f8284cac91428f8fcc8281e69117fa16e887 (diff) | |
download | linux-fsl-qoriq-ff2bb047c4bce9742e94911eeb44b4d6ff4734ab.tar.xz |
Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into next
Per pull request, for 3.5.
Diffstat (limited to 'fs/btrfs/ioctl.h')
0 files changed, 0 insertions, 0 deletions