Merge commit 'ccbf62d8a284cf181ac28c8e8407dd077d90dd4b' into for-next
authorAl Viro <viro@zeniv.linux.org.uk>
Thu, 7 Aug 2014 18:07:57 +0000 (14:07 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Thu, 7 Aug 2014 18:07:57 +0000 (14:07 -0400)
backmerge to avoid kernel/acct.c conflict


Trivial merge