Moving patches from for-linus to 3.18 instead, pull in this changes
that will go to Linus today.