]> err.no Git - linux-2.6/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 9 May 2007 19:54:17 +0000 (12:54 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 9 May 2007 19:54:17 +0000 (12:54 -0700)
commit9a9136e270af14da506f66bcafcc506b86a86498
treeb4d0a6877d92635134b7a944d0032fbc43227fd2
parent3960208f9ca0cf6bdb31c21c59ac0526303f8b34
parent7bb2acb76e8168ca5d0bde5a5a56585a11b3525a
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.
arch/i386/kernel/cpu/mcheck/therm_throt.c
block/ll_rw_blk.c
drivers/char/pcmcia/cm4000_cs.c
drivers/char/tty_io.c
fs/direct-io.c
init/Kconfig
kernel/relay.c
kernel/sys.c