Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

[mv-sheeva.git] / kernel / relay.c

diff --git a/kernel/relay.c b/kernel/relay.c
index 61a504900eaa5ba5acb5f3362d5d8105bafe9745..4311101b0ca75a46206a2e9a50f82bffd5683fa5 100644 (file)
--- a/kernel/relay.c
+++ b/kernel/relay.c
@@ -310,7 +310,7 @@ static struct rchan_callbacks default_channel_callbacks = {
 
 /**
  *     wakeup_readers - wake up readers waiting on a channel
- *     @data: contains the the channel buffer
+ *     @data: contains the channel buffer
  *
  *     This is the timer function used to defer reader waking.
  */