Linux 4.7 As requested by Daniel Vetter as the conflicts were getting messy.
mentioned in commit 177d91aa