diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-23 03:52:47 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-23 03:52:47 +0100 |
| commit | aab008db8063364dc3c8ccf4981c21124866b395 (patch) | |
| tree | 72914203f4decb023efdaabd0301a62d742dfa8c /net/dccp/output.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lli... (diff) | |
| parent | Merge branch 'stable/cleancache.v13' into linux-next (diff) | |
| download | linux-aab008db8063364dc3c8ccf4981c21124866b395.tar.xz linux-aab008db8063364dc3c8ccf4981c21124866b395.zip | |
Merge tag 'stable/for-linus-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/mm
Pull cleancache changes from Konrad Rzeszutek Wilk:
"This has some patches for the cleancache API that should have been
submitted a _long_ time ago. They are basically cleanups:
- rename of flush to invalidate
- moving reporting of statistics into debugfs
- use __read_mostly as necessary.
Oh, and also the MAINTAINERS file change. The files (except the
MAINTAINERS file) have been in #linux-next for months now. The late
addition of MAINTAINERS file is a brain-fart on my side - didn't
realize I needed that just until I was typing this up - and I based
that patch on v3.3 - so the tree is on top of v3.3."
* tag 'stable/for-linus-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/mm:
MAINTAINERS: Adding cleancache API to the list.
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/
Diffstat (limited to 'net/dccp/output.c')
0 files changed, 0 insertions, 0 deletions