Merge branch 'upstream-3.13' into tuxonice-3.13
Merge branch 'upstream-3.13' into tuxonice-3.13
Merge remote-tracking branch 'tuxonice-kernel/tuxonice-3.13' into pf-3.13
Fix big_key.c's use of shmem_kernel_file_setup

Fix big_key.c's use of shmem_kernel_file_setup, as noted by Arfrever
Frehtes Taifersar Arahesis and others.

Signed-off-by: Nigel Cunningham <nigel@tuxonice.net>
Revert "Revert "Revert "toi-3.13: mm: fix shmem functions calls"""

This reverts commit e9c9b980ef6ef430e22189dbb8731dac572de1fa.
Revert "Revert "Fix TuxOnIce shmem modifications.""

This reverts commit 818e89af3850ecd37667faacca97570cb66b242d.
Merge remote-tracking branch 'tuxonice-kernel/tuxonice-3.13' into pf-3.13