tree cd32d3053b30050182218e0d36b4aed7459c48de
parent 6e9101aeec39961308176e0f59e73ac5d37d243a
parent 4db70f73e56961b9bcdfd0c36c62847a18b7dbb5
author Ingo Molnar <mingo@elte.hu> 1306410510 +0200
committer Ingo Molnar <mingo@elte.hu> 1306410519 +0200

Merge branch 'linus' into perf/urgent

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>