linux-next: manual merge of the cgroup tree with the pm tree

[Stephen Rothwell]

Hi Tejun,

Today's linux-next merge of the cgroup tree got a conflict in
kernel/cgroup_freezer.c between commit 22b4e111fa01 ("cgroup_freezer:
prepare for removal of TIF_FREEZE") from the pm tree and commit
cfb5ec210751 ("cgroup: don't use subsys->can_attach_task() or
->attach_task()") from the cgroup tree.

The latter removes the code modified by the latter, so I just removed it
(freezer_can_attach_task).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature