From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Wed, 9 May 2007 19:54:17 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
X-Git-Tag: v2.6.22-rc1~147
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a9136e270af14da506f66bcafcc506b86a86498;p=linux-2.6

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.
---

9a9136e270af14da506f66bcafcc506b86a86498
diff --cc kernel/relay.c
index 61a504900e,d24395e8b6..4311101b0c
--- a/kernel/relay.c
+++ b/kernel/relay.c
@@@ -310,13 -310,16 +310,13 @@@ static struct rchan_callbacks default_c
  
  /**
   *	wakeup_readers - wake up readers waiting on a channel
-  *	@data: contains the the channel buffer
 - *	@work: work struct that contains the channel buffer
++ *	@data: contains the channel buffer
   *
 - *	This is the work function used to defer reader waking.  The
 - *	reason waking is deferred is that calling directly from write
 - *	causes problems if you're writing from say the scheduler.
 + *	This is the timer function used to defer reader waking.
   */
 -static void wakeup_readers(struct work_struct *work)
 +static void wakeup_readers(unsigned long data)
  {
 -	struct rchan_buf *buf =
 -		container_of(work, struct rchan_buf, wake_readers.work);
 +	struct rchan_buf *buf = (struct rchan_buf *)data;
  	wake_up_interruptible(&buf->read_wait);
  }