| commit | 1102c660dd35725a11c7ca9365c237f2f42f6b30 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Thu May 26 13:48:30 2011 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Thu May 26 13:48:39 2011 +0200 |
| tree | cd32d3053b30050182218e0d36b4aed7459c48de | |
| parent | 6e9101aeec39961308176e0f59e73ac5d37d243a [diff] | |
| parent | 4db70f73e56961b9bcdfd0c36c62847a18b7dbb5 [diff] |
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>