Applied upstream: http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=ae5b80d2b68eac945b124227dea34462118a6f01