Thanks, that indeed did it. It required http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=0a17af373c61b4ded44a2cbac62c05ae5dad2106 too for the patch to apply.