alistair23-linux/Documentation/power
Linus Torvalds 9a9136e270 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (25 commits)
  sound: convert "sound" subdirectory to UTF-8
  MAINTAINERS: Add cxacru website/mailing list
  include files: convert "include" subdirectory to UTF-8
  general: convert "kernel" subdirectory to UTF-8
  documentation: convert the Documentation directory to UTF-8
  Convert the toplevel files CREDITS and MAINTAINERS to UTF-8.
  remove broken URLs from net drivers' output
  Magic number prefix consistency change to Documentation/magic-number.txt
  trivial: s/i_sem /i_mutex/
  fix file specification in comments
  drivers/base/platform.c: fix small typo in doc
  misc doc and kconfig typos
  Remove obsolete fat_cvf help text
  Fix occurrences of "the the "
  Fix minor typoes in kernel/module.c
  Kconfig: Remove reference to external mqueue library
  Kconfig: A couple of grammatical fixes in arch/i386/Kconfig
  Correct comments in genrtc.c to refer to correct /proc file.
  Fix more "deprecated" spellos.
  Fix "deprecated" typoes.
  ...

Fix trivial comment conflict in kernel/relay.c.
2007-05-09 12:54:17 -07:00
..
basic-pm-debugging.txt Documentation: Ask driver writers to provide PM support 2007-05-08 11:14:59 -07:00
devices.txt
drivers-testing.txt Documentation: Ask driver writers to provide PM support 2007-05-08 11:14:59 -07:00
interface.txt power management: change /sys/power/disk display 2007-05-07 12:12:59 -07:00
kernel_threads.txt
pci.txt PCI Documentation: power/pci.txt fix copy/paste error 2007-05-02 19:02:35 -07:00
s2ram.txt
states.txt power management: remove firmware disk mode 2007-04-30 16:40:40 -07:00
swsusp-and-swap-files.txt
swsusp-dmcrypt.txt
swsusp.txt documentation: convert the Documentation directory to UTF-8 2007-05-09 08:58:19 +02:00
tricks.txt
userland-swsusp.txt PM: Separate hibernation code from suspend code 2007-05-09 12:30:48 -07:00
video.txt
video_extension.txt