aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/linux/linux-omap-2.6.37/linus/0046-watchdog-Improve-initialisation-error-message-and-do.patch
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2011-01-18 11:32:59 +0100
committerKoen Kooi <koen@openembedded.org>2011-01-18 11:53:28 +0100
commitc8195fa9cf57165ee28ac31477907991bc44bc76 (patch)
tree6a6a105f73abaf363e3a17caafd32060e2405aa4 /recipes/linux/linux-omap-2.6.37/linus/0046-watchdog-Improve-initialisation-error-message-and-do.patch
parent62eebc44737ee8a253770503d038be730ce9a3dd (diff)
downloadopenembedded-c8195fa9cf57165ee28ac31477907991bc44bc76.tar.gz
linux-omap 2.6.37: replace various patch with upstream versions and rediff
* The beagle poweron patch was split into 3 and accepted upstream thanks to Nishant * the 2 720MHz patches were combined and pending acceptance thanks to Sanjeev * the boardfile 720MHz patches aren't needed anymore Signed-off-by: Koen Kooi <koen@openembedded.org>
Diffstat (limited to 'recipes/linux/linux-omap-2.6.37/linus/0046-watchdog-Improve-initialisation-error-message-and-do.patch')
-rw-r--r--recipes/linux/linux-omap-2.6.37/linus/0046-watchdog-Improve-initialisation-error-message-and-do.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes/linux/linux-omap-2.6.37/linus/0046-watchdog-Improve-initialisation-error-message-and-do.patch b/recipes/linux/linux-omap-2.6.37/linus/0046-watchdog-Improve-initialisation-error-message-and-do.patch
index c07fa41c49..b490dc079c 100644
--- a/recipes/linux/linux-omap-2.6.37/linus/0046-watchdog-Improve-initialisation-error-message-and-do.patch
+++ b/recipes/linux/linux-omap-2.6.37/linus/0046-watchdog-Improve-initialisation-error-message-and-do.patch
@@ -1,7 +1,7 @@
-From 551423748a4eba55f2eb0fc250d757986471f187 Mon Sep 17 00:00:00 2001
+From 358160309eeeb8e29b74240874267ea9f7e43d36 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Sun, 2 Jan 2011 23:02:42 +0000
-Subject: [PATCH 46/66] watchdog: Improve initialisation error message and documentation
+Subject: [PATCH 46/65] watchdog: Improve initialisation error message and documentation
The error message 'NMI watchdog failed to create perf event...'
does not make it clear that this is a fatal error for the