aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/xattr.h
diff options
context:
space:
mode:
authorJames Morris <james.l.morris@oracle.com>2012-09-28 13:37:32 +1000
committerJames Morris <james.l.morris@oracle.com>2012-09-28 13:37:32 +1000
commitbf5308344527d015ac9a6d2bda4ad4d40fd7d943 (patch)
tree566e61e2cfc648c374d15cfc8c661b73e1a471f8 /include/linux/xattr.h
parentMerge branch 'for-1209' of git://gitorious.org/smack-next/kernel into next (diff)
parentLinux 3.6-rc7 (diff)
downloadlinux-dev-bf5308344527d015ac9a6d2bda4ad4d40fd7d943.tar.xz
linux-dev-bf5308344527d015ac9a6d2bda4ad4d40fd7d943.zip
Merge tag 'v3.6-rc7' into next
Linux 3.6-rc7 Requested by David Howells so he can merge his key susbsystem work into my tree with requisite -linus changesets.
Diffstat (limited to 'include/linux/xattr.h')
0 files changed, 0 insertions, 0 deletions