Merge commit '12890d0f61fc' into arch-mips
authorAl Viro <viro@zeniv.linux.org.uk>
Sun, 3 Feb 2013 23:16:33 +0000 (18:16 -0500)
committerAl Viro <viro@zeniv.linux.org.uk>
Sun, 3 Feb 2013 23:16:33 +0000 (18:16 -0500)

Trivial merge