Jens Axboe ee9a3607fb Merge branch 'master' into for-2.6.35 ... Conflicts: fs/ext3/fsync.c Signed-off-by: Jens Axboe <jens.axboe@oracle.com>		2010-05-21 21:27:26 +02:00
..
00-INDEX	trivial: fix where cgroup documentation is not correctly referred to	2009-03-30 15:22:02 +02:00
blkio-controller.txt	blk-cgroup: config options re-arrangement	2010-04-26 19:27:56 +02:00
cgroup_event_listener.c	cgroups: add simple listener of cgroup events to documentation	2010-03-12 15:52:37 -08:00
cgroups.txt	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
cpuacct.txt	cpuacct: add per-cgroup utime/stime statistics	2009-04-01 16:49:38 +02:00
cpusets.txt	cpuset: Fix documentation punctuation	2010-03-25 10:19:29 +01:00
devices.txt	trivial: cgroups: documentation typo and spelling corrections	2009-03-30 15:21:58 +02:00
freezer-subsystem.txt	freezer_cg: disable writing freezer.state of root cgroup	2008-11-12 17:17:16 -08:00
memcg_test.txt	Documentation/: it's -> its where appropriate	2010-04-23 02:09:52 +02:00
memory.txt	Documentation/: it's -> its where appropriate	2010-04-23 02:09:52 +02:00
resource_counter.txt	res_counter: update documentation	2009-04-13 15:04:30 -07:00