Merge branch 'upstream-3.7' into tuxonice-3.7
Fix TuxOnIce infinite loop in freeing memory.

Modify our tweaks to the memory freeing logic to avoid an infinite
loop. Further work is required to improve our ability to get all the
memory we should get, without the potential for getting stuck in here
forever.

Signed-off-by: Nigel Cunningham <nigel@nigelcunningham.com.au>
Merge remote-tracking branch 'tuxonice-kernel/tuxonice-3.7' into pf-3.7