diff options
| author | James Morris <jmorris@namei.org> | 2011-05-19 10:51:57 +0200 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-05-19 10:51:57 +0200 |
| commit | 12a5a2621b1ee14d32beca35304d7c6076a58815 (patch) | |
| tree | 213e13f99de690b3c4a510f504393b63ada626bd /kernel/sysctl.c | |
| parent | TOMOYO: Fix wrong domainname validation. (diff) | |
| parent | Linux 2.6.39 (diff) | |
| download | linux-12a5a2621b1ee14d32beca35304d7c6076a58815.tar.xz linux-12a5a2621b1ee14d32beca35304d7c6076a58815.zip | |
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/sysctl.c')
0 files changed, 0 insertions, 0 deletions