| commit | 85910c202bb869edd2bb9a6c217a658c83f06f1e | [log] [tgz] |
|---|---|---|
| author | Al Viro <viro@zeniv.linux.org.uk> | Fri Nov 16 20:48:13 2012 -0500 |
| committer | Al Viro <viro@zeniv.linux.org.uk> | Fri Nov 16 20:49:06 2012 -0500 |
| tree | fcf4bf1ba2ebfcb6dec395a10ed6b33e7d33217e | |
| parent | f7200d4c504a385b1b70f3bab379f99745f7ef6a [diff] | |
| parent | 517ffce4e1a03aea979fe3a18a3dd1761a24fafb [diff] |
Merge commit '517ffce4e1a03aea979fe3a18a3dd1761a24fafb' into arch-sparc Backmerge from the point in mainline where a trivial conflict had been introduced (arch/sparc/kernel/sys_sparc_64.c had grown sys_kern_features() right after where kernel_execve() used to be) Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>