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