Merge tag '4.4-additional' of git://git.lwn.net/linux