diff options
author | James Morris <jmorris@namei.org> | 2011-05-13 09:52:16 +1000 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2011-05-13 09:52:16 +1000 |
commit | ca7d12000895ae5dfef8b8ff2648a0d50abd397c (patch) | |
tree | 259fb1e473ef6129b9fa5faf771c9e811ab572c4 /fs/timerfd.c | |
parent | 411f05f123cbd7f8aa1edcae86970755a6e2a9d9 (diff) | |
parent | 93826c092c385549c04af184fbebd43f36995c69 (diff) |
Merge branch 'for-linus' of git://git.infradead.org/users/eparis/selinux into for-linus
Diffstat (limited to 'fs/timerfd.c')
0 files changed, 0 insertions, 0 deletions