diff options
author | James Morris <jmorris@namei.org> | 2011-05-19 08:51:57 (GMT) |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2011-05-19 08:51:57 (GMT) |
commit | 12a5a2621b1ee14d32beca35304d7c6076a58815 (patch) | |
tree | 213e13f99de690b3c4a510f504393b63ada626bd /kernel/kmod.c | |
parent | e77dc3460fa59be5759e9327ad882868eee9d61b (diff) | |
parent | 61c4f2c81c61f73549928dfd9f3e8f26aa36a8cf (diff) | |
download | linux-fsl-qoriq-12a5a2621b1ee14d32beca35304d7c6076a58815.tar.xz |
Merge branch 'master' into next
Conflicts:
include/linux/capability.h
Manually resolve merge conflict w/ thanks to Stephen Rothwell.
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'kernel/kmod.c')
0 files changed, 0 insertions, 0 deletions