From: Ingo Molnar Date: Thu, 26 May 2011 11:48:30 +0000 (+0200) Subject: Merge branch 'linus' into perf/urgent X-Git-Tag: v3.0-rc1~25^2~11 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=1102c660dd35725a11c7ca9365c237f2f42f6b30 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 --- 1102c660dd35725a11c7ca9365c237f2f42f6b30