Merge branch 'linus' into perf/urgent
Ingo Molnar [Thu, 26 May 2011 11:48:30 +0000 (13:48 +0200)]
Merge reason: Linus applied an overlapping commit:

  5f2e8e2b0bf0: kernel/watchdog.c: Use proper ANSI C prototypes

So merge it in to make sure we can iterate the file without conflicts.

Signed-off-by: Ingo Molnar <mingo@elte.hu>


Trivial merge