3.19 Merge window part 2

From the original patch submission:

> When I was reading the documentation, my 4-year-old
> niece wanted to see what I was doing. After telling her,
> she noticed that something was very wrong and asked
> me to fix it. Instead, I helped her fix it herself.

And that is how an entire community of kernel hackers melted.