1
0
Fork 0
alistair23-linux/Documentation/cgroups
Linus Torvalds 6c51038900 Merge branch 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block
* 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block: (65 commits)
  Documentation/iostats.txt: bit-size reference etc.
  cfq-iosched: removing unnecessary think time checking
  cfq-iosched: Don't clear queue stats when preempt.
  blk-throttle: Reset group slice when limits are changed
  blk-cgroup: Only give unaccounted_time under debug
  cfq-iosched: Don't set active queue in preempt
  block: fix non-atomic access to genhd inflight structures
  block: attempt to merge with existing requests on plug flush
  block: NULL dereference on error path in __blkdev_get()
  cfq-iosched: Don't update group weights when on service tree
  fs: assign sb->s_bdi to default_backing_dev_info if the bdi is going away
  block: Require subsystems to explicitly allocate bio_set integrity mempool
  jbd2: finish conversion from WRITE_SYNC_PLUG to WRITE_SYNC and explicit plugging
  jbd: finish conversion from WRITE_SYNC_PLUG to WRITE_SYNC and explicit plugging
  fs: make fsync_buffers_list() plug
  mm: make generic_writepages() use plugging
  blk-cgroup: Add unaccounted time to timeslice_used.
  block: fixup plugging stubs for !CONFIG_BLOCK
  block: remove obsolete comments for blkdev_issue_zeroout.
  blktrace: Use rq->cmd_flags directly in blk_add_trace_rq.
  ...

Fix up conflicts in fs/{aio.c,super.c}
2011-03-24 10:16:26 -07: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: Lower minimum weight from 100 to 10. 2011-03-08 19:45:00 +01:00
cgroup_event_listener.c tree-wide: fix comment/printk typos 2010-11-01 15:38:34 -04:00
cgroups.txt Documentation: update cgroup pid and cpuset information 2011-03-16 10:47:04 -07:00
cpuacct.txt cpuacct: add per-cgroup utime/stime statistics 2009-04-01 16:49:38 +02:00
cpusets.txt Update cpuset info & webiste for cgroups 2011-03-08 23:12: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 tree-wide: fix comment/printk typos 2010-11-01 15:38:34 -04:00
memory.txt memcg: clarify use_hierarchy documentation 2011-02-17 09:17:21 +01:00
resource_counter.txt res_counter: update documentation 2009-04-13 15:04:30 -07:00