From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sat, 17 Nov 2012 01:48:13 +0000 (-0500)
Subject: Merge commit '517ffce4e1a03aea979fe3a18a3dd1761a24fafb' into arch-sparc
X-Git-Tag: omap-for-v3.8/fixes-for-merge-window-v4-signed~47^2~43^2~4^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85910c202bb869edd2bb9a6c217a658c83f06f1e;p=pandora-kernel.git

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>
---

85910c202bb869edd2bb9a6c217a658c83f06f1e
Reading git-diff-tree failed