From 6b6d566ab2f1e4ae53e6e66cd5ca6874e6f00c2f Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 15 Feb 2011 16:18:00 -0800 Subject: [PATCH] fix up some names that quilt doesn't like --- .../staging-rt2860-fix-previous-patch-error.patch | 8 ++++---- .../staging-rt3090-fix-rt3090-scan-ap-function.patch | 8 ++++---- ...oc-da8xx-omap-l1xx-match-codec_name-with-i2c-ids.patch | 6 +++--- .../staging-rt2860-fix-previous-patch-error.patch | 8 ++++---- .../staging-rt3090-fix-rt3090-scan-ap-function.patch | 8 ++++---- ...log-board-name-when-present-in-dmesg-oops-output.patch | 1 - 6 files changed, 19 insertions(+), 20 deletions(-) diff --git a/queue-2.6.36/staging-rt2860-fix-previous-patch-error.patch b/queue-2.6.36/staging-rt2860-fix-previous-patch-error.patch index d5d7ed026f4..71fe08769bf 100644 --- a/queue-2.6.36/staging-rt2860-fix-previous-patch-error.patch +++ b/queue-2.6.36/staging-rt2860-fix-previous-patch-error.patch @@ -1,17 +1,17 @@ From 1f0613158ea14b399fd7a16470630a729ba9d0c3 Mon Sep 17 00:00:00 2001 -From: Chen, Chien-Chia +From: Chien-Chia Chen Date: Thu, 9 Dec 2010 10:52:08 +0800 Subject: Staging: rt2860: fix previous patch error -From: Chen, Chien-Chia +From: Chien-Chia Chen commit 1f0613158ea14b399fd7a16470630a729ba9d0c3 upstream. Somehow Greg messed up the last patch and missed a chunk. This patch contains the missing chunk. -Acked-by: Lee, Chun-Yi -Signed-off-by: Chen, Chien-Chia +Acked-by: Chun-Yi Lee +Signed-off-by: Chien-Chia Chen Signed-off-by: Greg Kroah-Hartman --- diff --git a/queue-2.6.36/staging-rt3090-fix-rt3090-scan-ap-function.patch b/queue-2.6.36/staging-rt3090-fix-rt3090-scan-ap-function.patch index 3e4bf771b1a..4a6006fb973 100644 --- a/queue-2.6.36/staging-rt3090-fix-rt3090-scan-ap-function.patch +++ b/queue-2.6.36/staging-rt3090-fix-rt3090-scan-ap-function.patch @@ -1,9 +1,9 @@ From 1226056d9608d241db4b558a0d88a347ad5c66ae Mon Sep 17 00:00:00 2001 -From: Chen, Chien-Chia +From: Chien-Chia Chen Date: Wed, 8 Dec 2010 14:20:33 -0800 Subject: Staging: rt3090: Fix RT3090 scan AP function -From: Chen, Chien-Chia +From: Chien-Chia Chen commit 1226056d9608d241db4b558a0d88a347ad5c66ae upstream. @@ -13,8 +13,8 @@ This patch fixes the rt3090 wireless module failed to scan AP around due to Windows driver causing rt3090 module unable to scan AP in Linux. -Acked-by: Lee, Chun-Yi -Signed-off-by: Chen, Chien-Chia +Acked-by: Chun-Yi Lee +Signed-off-by: Chien-Chia Chen Signed-off-by: Greg Kroah-Hartman --- diff --git a/queue-2.6.37/asoc-da8xx-omap-l1xx-match-codec_name-with-i2c-ids.patch b/queue-2.6.37/asoc-da8xx-omap-l1xx-match-codec_name-with-i2c-ids.patch index 806789a2c10..92e1d3cb9d7 100644 --- a/queue-2.6.37/asoc-da8xx-omap-l1xx-match-codec_name-with-i2c-ids.patch +++ b/queue-2.6.37/asoc-da8xx-omap-l1xx-match-codec_name-with-i2c-ids.patch @@ -1,9 +1,9 @@ From dc5a460a1bfa44273653700e33d4e7051194cbfd Mon Sep 17 00:00:00 2001 -From: Rajashekhara, Sudhakar +From: Sudhakar Rajashekhara Date: Fri, 21 Jan 2011 20:10:01 +0530 Subject: ASoC: da8xx/omap-l1xx: match codec_name with i2c ids -From: Rajashekhara, Sudhakar +From: Sudhakar Rajashekhara commit dc5a460a1bfa44273653700e33d4e7051194cbfd upstream. @@ -11,7 +11,7 @@ The codec_name entry for da8xx evm in sound/soc/davinci/davinci-evm.c is not matching with the i2c ids in the board file. Without this fix the soundcard does not get detected on da850/omap-l138/am18x evm. -Signed-off-by: Rajashekhara, Sudhakar +Signed-off-by: Sudhakar Rajashekhara Tested-by: Dan Sharon Acked-by: Liam Girdwood Signed-off-by: Mark Brown diff --git a/queue-2.6.37/staging-rt2860-fix-previous-patch-error.patch b/queue-2.6.37/staging-rt2860-fix-previous-patch-error.patch index d5d7ed026f4..71fe08769bf 100644 --- a/queue-2.6.37/staging-rt2860-fix-previous-patch-error.patch +++ b/queue-2.6.37/staging-rt2860-fix-previous-patch-error.patch @@ -1,17 +1,17 @@ From 1f0613158ea14b399fd7a16470630a729ba9d0c3 Mon Sep 17 00:00:00 2001 -From: Chen, Chien-Chia +From: Chien-Chia Chen Date: Thu, 9 Dec 2010 10:52:08 +0800 Subject: Staging: rt2860: fix previous patch error -From: Chen, Chien-Chia +From: Chien-Chia Chen commit 1f0613158ea14b399fd7a16470630a729ba9d0c3 upstream. Somehow Greg messed up the last patch and missed a chunk. This patch contains the missing chunk. -Acked-by: Lee, Chun-Yi -Signed-off-by: Chen, Chien-Chia +Acked-by: Chun-Yi Lee +Signed-off-by: Chien-Chia Chen Signed-off-by: Greg Kroah-Hartman --- diff --git a/queue-2.6.37/staging-rt3090-fix-rt3090-scan-ap-function.patch b/queue-2.6.37/staging-rt3090-fix-rt3090-scan-ap-function.patch index 3e4bf771b1a..4a6006fb973 100644 --- a/queue-2.6.37/staging-rt3090-fix-rt3090-scan-ap-function.patch +++ b/queue-2.6.37/staging-rt3090-fix-rt3090-scan-ap-function.patch @@ -1,9 +1,9 @@ From 1226056d9608d241db4b558a0d88a347ad5c66ae Mon Sep 17 00:00:00 2001 -From: Chen, Chien-Chia +From: Chien-Chia Chen Date: Wed, 8 Dec 2010 14:20:33 -0800 Subject: Staging: rt3090: Fix RT3090 scan AP function -From: Chen, Chien-Chia +From: Chien-Chia Chen commit 1226056d9608d241db4b558a0d88a347ad5c66ae upstream. @@ -13,8 +13,8 @@ This patch fixes the rt3090 wireless module failed to scan AP around due to Windows driver causing rt3090 module unable to scan AP in Linux. -Acked-by: Lee, Chun-Yi -Signed-off-by: Chen, Chien-Chia +Acked-by: Chun-Yi Lee +Signed-off-by: Chien-Chia Chen Signed-off-by: Greg Kroah-Hartman --- diff --git a/queue-2.6.37/x86-dmi-debug-log-board-name-when-present-in-dmesg-oops-output.patch b/queue-2.6.37/x86-dmi-debug-log-board-name-when-present-in-dmesg-oops-output.patch index cf5ecdd7030..c611f9c1521 100644 --- a/queue-2.6.37/x86-dmi-debug-log-board-name-when-present-in-dmesg-oops-output.patch +++ b/queue-2.6.37/x86-dmi-debug-log-board-name-when-present-in-dmesg-oops-output.patch @@ -28,7 +28,6 @@ After the fix: Signed-off-by: Naga Chumbalkar Reviewed-by: Bjorn Helgaas -Cc: # .3x - good for debugging, please apply as far back as it applies cleanly LKML-Reference: <20110214224423.2182.13929.sendpatchset@nchumbalkar.americas.hpqcorp.net> Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman -- 2.47.3