1
0
Fork 0
alistair23-linux/Documentation/cgroups
Linus Torvalds e16b396ce3 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (47 commits)
  doc: CONFIG_UNEVICTABLE_LRU doesn't exist anymore
  Update cpuset info & webiste for cgroups
  dcdbas: force SMI to happen when expected
  arch/arm/Kconfig: remove one to many l's in the word.
  asm-generic/user.h: Fix spelling in comment
  drm: fix printk typo 'sracth'
  Remove one to many n's in a word
  Documentation/filesystems/romfs.txt: fixing link to genromfs
  drivers:scsi Change printk typo initate -> initiate
  serial, pch uart: Remove duplicate inclusion of linux/pci.h header
  fs/eventpoll.c: fix spelling
  mm: Fix out-of-date comments which refers non-existent functions
  drm: Fix printk typo 'failled'
  coh901318.c: Change initate to initiate.
  mbox-db5500.c Change initate to initiate.
  edac: correct i82975x error-info reported
  edac: correct i82975x mci initialisation
  edac: correct commented info
  fs: update comments to point correct document
  target: remove duplicate include of target/target_core_device.h from drivers/target/target_core_hba.c
  ...

Trivial conflict in fs/eventpoll.c (spelling vs addition)
2011-03-18 10:37:40 -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: Allow creation of hierarchical cgroups 2010-11-15 19:37:36 +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