Merge branch 'upstream-3.10' into tuxonice-3.10
Merge remote-tracking branch 'tuxonice-kernel/tuxonice-3.10' into pf-3.10
distro-3.10: fix Arch version
Merge branch 'distro-3.10' into pf-3.10