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)
commit82df9c8bebeff610705f30315f3903cbcb3aa58b
tree0d54eac4e7b46876111256caf169b22627441453
parent19583ca584d6f574384e17fe7613dfaeadcdc4a6
parentccbf62d8a284cf181ac28c8e8407dd077d90dd4b
Merge commit 'ccbf62d8a284cf181ac28c8e8407dd077d90dd4b' into for-next

backmerge to avoid kernel/acct.c conflict
MAINTAINERS
arch/arm/Kconfig
arch/x86/Kconfig
include/linux/sched.h