Merge branch 'upstream-3.9' into tuxonice-3.9
tuxonice-3.9: attempt to fix THP TOI issue as suggested by Nigel
Merge branch 'tuxonice-3.9' into pf-3.9