You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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}		14 years ago
..
00-INDEX	trivial: fix where cgroup documentation is not correctly referred to	16 years ago
blkio-controller.txt	blk-cgroup: Lower minimum weight from 100 to 10.	14 years ago
cgroup_event_listener.c	tree-wide: fix comment/printk typos	14 years ago
cgroups.txt	Documentation: update cgroup pid and cpuset information	14 years ago
cpuacct.txt	cpuacct: add per-cgroup utime/stime statistics	16 years ago
cpusets.txt	Update cpuset info & webiste for cgroups	14 years ago
devices.txt	trivial: cgroups: documentation typo and spelling corrections	16 years ago
freezer-subsystem.txt	…
memcg_test.txt	tree-wide: fix comment/printk typos	14 years ago
memory.txt	memcg: clarify use_hierarchy documentation	14 years ago
resource_counter.txt	res_counter: update documentation	16 years ago