Jens Axboe 7407cf355f Merge branch 'master' into for-2.6.35 ...

Conflicts:
	fs/block_dev.c

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

2010-04-29 09:36:24 +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

cgroups: fix procs documentation

2010-04-24 11:31:25 -07:00

cpuacct.txt

cpuacct: add per-cgroup utime/stime statistics

2009-04-01 16:49:38 +02:00

cpusets.txt

doc: cpuset: Update the cpuset flag file

2010-02-24 11:06:39 +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

memcg: fix typos in memcg_test.txt

2010-03-12 15:52:38 -08:00

memory.txt

memcg: fix typo in memcg documentation

2010-03-24 16:31:20 -07:00

resource_counter.txt

res_counter: update documentation

2009-04-13 15:04:30 -07:00