Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	drivers/usb/input/Makefile
	drivers/usb/input/gtco.c

1 files changed, 1 insertions, 2 deletions

diff --git a/kernel/relay.c b/kernel/relay.c
index ef8a935710a2..577f251c7e28 100644
--- a/kernel/relay.c
+++ b/kernel/relay.c
@@ -474,13 +474,12 @@ static void setup_callbacks(struct rchan *chan,
 }
 
 /**
- *
  *      relay_hotcpu_callback - CPU hotplug callback
  *      @nb: notifier block
  *      @action: hotplug action to take
  *      @hcpu: CPU number
  *
- *      Returns the success/failure of the operation. (NOTIFY_OK, NOTIFY_BAD)
+ *      Returns the success/failure of the operation. (%NOTIFY_OK, %NOTIFY_BAD)
  */
 static int __cpuinit relay_hotcpu_callback(struct notifier_block *nb,
                                 unsigned long action,