| commit | 7d45ecafb6792ca68da9517969d37d910601845f | |
| author | James Morris <jmorris@namei.org> | |
| Mon, 13 Jul 2009 14:30:40 +0000 (14 00:30 +1000) | ||
| committer | James Morris <jmorris@namei.org> | |
| Mon, 13 Jul 2009 14:30:40 +0000 (14 00:30 +1000) | ||
| tree | a98b1074e5577e66a97963745f975404d0aac266 | treesnapshot (tar.gz zip) |
| parent | be940d6279c30a2d7c4e8d1d5435f957f594d66d | commitdiff |
| parent | 7638d5322bd89d49e013a03fe2afaeb6d214fabd | commitdiff |
Merge branch 'master' into next
Conflicts:
include/linux/personality.h
Use Linus' version.
Signed-off-by: James Morris <jmorris@namei.org>
Conflicts:
include/linux/personality.h
Use Linus' version.
Signed-off-by: James Morris <jmorris@namei.org>
| kernel/ptrace.c | diff1 | diff2 | blobhistory |