From: Al Viro <viro@zeniv.linux.org.uk>
Date: Thu, 7 Aug 2014 18:07:57 +0000 (-0400)
Subject: Merge commit 'ccbf62d8a284cf181ac28c8e8407dd077d90dd4b' into for-next
X-Git-Tag: v3.17-rc1~44^2~40
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=82df9c8bebeff610705f30315f3903cbcb3aa58b;p=linux.git

Merge commit 'ccbf62d8a284cf181ac28c8e8407dd077d90dd4b' into for-next

backmerge to avoid kernel/acct.c conflict
---

82df9c8bebeff610705f30315f3903cbcb3aa58b