]> rtime.felk.cvut.cz Git - can-eth-gw-linux.git/commit
projects / can-eth-gw-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f7200d4 517ffce)
Merge commit '517ffce4e1a03aea979fe3a18a3dd1761a24fafb' into arch-sparc
authorAl Viro <viro@zeniv.linux.org.uk>
Sat, 17 Nov 2012 01:48:13 +0000 (20:48 -0500)
committerAl Viro <viro@zeniv.linux.org.uk>
Sat, 17 Nov 2012 01:49:06 +0000 (20:49 -0500)
commit85910c202bb869edd2bb9a6c217a658c83f06f1e
treefcf4bf1ba2ebfcb6dec395a10ed6b33e7d33217etree | snapshot
parentf7200d4c504a385b1b70f3bab379f99745f7ef6acommit | diff
parent517ffce4e1a03aea979fe3a18a3dd1761a24fafbcommit | 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>
arch/sparc/include/asm/ptrace.h diff1 | diff2 | blob | history
arch/sparc/include/asm/thread_info_64.h diff1 | diff2 | blob | history
arch/sparc/kernel/process_64.c diff1 | diff2 | blob | history
arch/sparc/kernel/sys_sparc_64.c diff1 | diff2 | blob | history
arch/sparc/kernel/systbls_64.S diff1 | diff2 | blob | history