diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-22 19:52:47 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-22 19:52:47 -0700 |
commit | aab008db8063364dc3c8ccf4981c21124866b395 (patch) | |
tree | 72914203f4decb023efdaabd0301a62d742dfa8c /MAINTAINERS | |
parent | 4f5b1affdda3e0c48cac674182f52004137b0ffc (diff) | |
parent | 16c0cfa425b8e1488f7a1873bd112a7a099325f0 (diff) | |
download | linux-stable-aab008db8063364dc3c8ccf4981c21124866b395.tar.gz linux-stable-aab008db8063364dc3c8ccf4981c21124866b395.tar.bz2 linux-stable-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 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 58f60356f071..922a674974a9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1832,6 +1832,13 @@ L: alsa-devel@alsa-project.org (moderated for non-subscribers) S: Supported F: sound/soc/codecs/cs4270* +CLEANCACHE API +M: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> +L: linux-kernel@vger.kernel.org +S: Maintained +F: mm/cleancache.c +F: include/linux/cleancache.h + CLK API M: Russell King <linux@arm.linux.org.uk> F: include/linux/clk.h |