Merge branch 'arch-s390' into no-rebases
authorAl Viro <viro@zeniv.linux.org.uk>
Sat, 17 Nov 2012 03:27:45 +0000 (22:27 -0500)
committerAl Viro <viro@zeniv.linux.org.uk>
Sat, 17 Nov 2012 03:27:45 +0000 (22:27 -0500)

Trivial merge