linux-next: manual merge of the trivial tree with Linus' tree
From: Stephen Rothwell
Date: Tue Aug 26 2014 - 00:29:22 EST
Today's linux-next merge of the trivial tree got a conflict in
mm/memcontrol.c between commit 747db954cab6 ("mm: memcontrol: use page
lists for uncharge batching") from Linus' tree and commit cc5ac3e15fa5
("mm: memcontrol: fix comment") from the trivial tree.
I fixed it up (the former removed the comment changed by the latter)
and can carry the fix as necessary (no action is required).
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Description: PGP signature