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