From: Ingo Molnar Date: Thu, 26 May 2011 11:48:30 +0000 (+0200) Subject: Merge branch 'linus' into perf/urgent X-Git-Tag: MMI-PSA29.97-13-9~18912^2~66 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1102c660dd35725a11c7ca9365c237f2f42f6b30;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git 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