git.maquefel.me Git - linux.git/commit

author	Al Viro <viro@zeniv.linux.org.uk>
	Sat, 17 Nov 2012 01:48:13 +0000 (20:48 -0500)
committer	Al Viro <viro@zeniv.linux.org.uk>
	Sat, 17 Nov 2012 01:49:06 +0000 (20:49 -0500)
commit	85910c202bb869edd2bb9a6c217a658c83f06f1e
tree	fcf4bf1ba2ebfcb6dec395a10ed6b33e7d33217e	tree \| snapshot
parent	f7200d4c504a385b1b70f3bab379f99745f7ef6a	commit \| diff
parent	517ffce4e1a03aea979fe3a18a3dd1761a24fafb	commit \| 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>

ep93xx device tree rework repo: git://git.maquefel.me/linux.git

RSS Atom

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