Al Viro 85910c202b 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>

2012-11-16 20:49:06 -05:00

3.1 KiB

Raw Blame History

View Raw