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: Move freezer.h include in fs.h.

Move the #include of freezer.h in fs.h, to avoid causing problems
to userspace programs being compiled against fs.h. Thanks to
Ozan Caglayan for reporting this.

Signed-off-by: Nigel Cunningham <nigel@tuxonice.net>
Merge branch 'fs-freezing' into fs-freezing-modules
Merge branch 'fs-freezing-modules' into combined
Merge branch 'origin' into tuxonice
Merge branch 'tuxonice' into paranoia
Merge branch 'tuxonice' into clustering
Merge branch 'tuxonice' into tuxonice-modules
Merge branch 'tuxonice' into fs-freezing

Conflicts:
	fs/fuse/inode.c
Merge branch 'paranoia' into paranoia-modules
Merge branch 'paranoia-modules' into combined

Conflicts:
	fs/fuse/inode.c
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