linux-next: manual merge of the tmem tree with the trivial tree

[Stephen Rothwell]

Hi Dan,

Today's linux-next merge of the tmem tree got a conflict in
mm/cleancache.c between commit c460578a674f ("Documentation: fix broken
references") from the  tree and commit c3adff5aa194 ("mm: cleancache:
report statistics via debugfs instead of sysfs") from the tmem tree.

The latter removed the comment that the former was correcting.  So I sued
the letter version.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature