Merge branch 'clustering' into clustering-modules
Merge branch 'clustering-modules' into combined
Merge branch 'tuxonice-modules' into tuxonice-modules-clustering
Merge branch 'tuxonice-modules' into tuxonice-modules-paranoia
Merge branch 'tuxonice-modules-clustering' into combined
Merge branch 'tuxonice-modules-paranoia' into combined
Merge branch 'fs-freezing' into fs-freezing-modules
Merge branch 'fs-freezing-modules' into combined
TuxOnIce: Improve Makefile paranoia rules.

Apply Makefile improvements suggested on LKML.

Signed-off-by: Nigel Cunningham <nigel@tuxonice.net>
Merge branch 'paranoia' into paranoia-modules
Merge branch 'paranoia-modules' into combined
TuxOnIce: Apply Makefile improvements from LKML.

Apply Makefile improvements for storage allocator, suggested on LKML.

Signed-off-by: Nigel Cunningham <nigel@tuxonice.net>
Merge branch 'tuxonice' into paranoia

Conflicts:
	kernel/power/Makefile
Merge branch 'tuxonice' into clustering
Merge branch 'tuxonice' into tuxonice-modules
Merge branch 'tuxonice' into fs-freezing
Merge branch 'paranoia' into paranoia-modules
Merge branch 'paranoia-modules' into combined
Merge branch 'clustering' into clustering-modules
Merge branch 'clustering-modules' into combined