Merge branch 'stable/cleancache.v13' into linux-next
Konrad Rzeszutek Wilk [Mon, 19 Mar 2012 16:12:19 +0000 (12:12 -0400)]
* stable/cleancache.v13:
  mm: cleancache: Use __read_mostly as appropiate.
  mm: cleancache: report statistics via debugfs instead of sysfs.
  mm: zcache/tmem/cleancache: s/flush/invalidate/
  mm: cleancache: s/flush/invalidate/

1  2 
drivers/staging/zcache/zcache-main.c
fs/block_dev.c
fs/super.c
mm/filemap.c

Simple merge
diff --cc fs/block_dev.c
Simple merge
diff --cc fs/super.c
Simple merge
diff --cc mm/filemap.c
Simple merge