Merge branch 'upstream-3.15' into tuxonice-3.15
Merge remote-tracking branch 'tuxonice-kernel/tuxonice-3.15' into pf-3.15