diff options
author | James Morris <jmorris@namei.org> | 2010-11-29 08:27:07 +1100 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2010-11-29 08:27:07 +1100 |
commit | 1d6d75684d869406e5bb2ac5d3ed9454f52d0cab (patch) | |
tree | afb229254bed6415407b7b7d4641f9f792109966 /include/linux/capability.h | |
parent | 074e61ec3751da9ab88ee66d3818574556c03489 (diff) | |
parent | 0f639a3c5ca63dd76ee07de9b02ebf0178ce9a17 (diff) | |
download | blackbird-op-linux-1d6d75684d869406e5bb2ac5d3ed9454f52d0cab.tar.gz blackbird-op-linux-1d6d75684d869406e5bb2ac5d3ed9454f52d0cab.zip |
Merge branch 'master' into next
Diffstat (limited to 'include/linux/capability.h')
0 files changed, 0 insertions, 0 deletions