3.0 patches

4 files changed, 34 insertions, 0 deletions

diff --git a/queue-3.0/arm-dove-fix-second-spi-initialization-call.patch b/queue-3.0/arm-dove-fix-second-spi-initialization-call.patch
new file mode 100644
index 0000000000..e7cc21e1eb
--- /dev/null
+++ b/queue-3.0/arm-dove-fix-second-spi-initialization-call.patch
@@ -0,0 +1,31 @@
+From 72cc205611879525db0374d9831f84f787112b25 Mon Sep 17 00:00:00 2001
+From: Nicolas Pitre <nicolas.pitre@linaro.org>
+Date: Wed, 14 Sep 2011 01:22:05 -0400
+Subject: ARM: Dove: fix second SPI initialization call
+
+From: Nicolas Pitre <nicolas.pitre@linaro.org>
+
+commit 72cc205611879525db0374d9831f84f787112b25 upstream.
+
+Commit 980f9f601a "ARM: orion: Consolidate SPI initialization."
+broke it by overwriting the SPI0 registration.
+
+Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
+Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ arch/arm/mach-dove/common.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/arm/mach-dove/common.c
++++ b/arch/arm/mach-dove/common.c
+@@ -160,7 +160,7 @@ void __init dove_spi0_init(void)
+ 
+ void __init dove_spi1_init(void)
+ {
+-	orion_spi_init(DOVE_SPI1_PHYS_BASE, get_tclk());
++	orion_spi_1_init(DOVE_SPI1_PHYS_BASE, get_tclk());
+ }
+ 
+ /*****************************************************************************
diff --git a/queue-3.0/iwlagn-fix-command-queue-timeout.patch b/queue-3.0/iwlagn-fix-command-queue-timeout.patch
index 75e45e2c85..c68aa6494a 100644
--- a/queue-3.0/iwlagn-fix-command-queue-timeout.patch
+++ b/queue-3.0/iwlagn-fix-command-queue-timeout.patch
@@ -20,6 +20,7 @@ a command completes.
 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
 Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
 Signed-off-by: John W. Linville <linville@tuxdriver.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 ---
  drivers/net/wireless/iwlwifi/iwl-tx.c |    2 ++
diff --git a/queue-3.0/qla2xxx-correct-inadvertent-loop-state-transitions-during-port-update-handling.patch b/queue-3.0/qla2xxx-correct-inadvertent-loop-state-transitions-during-port-update-handling.patch
index e09c55a3ff..1bf49a7136 100644
--- a/queue-3.0/qla2xxx-correct-inadvertent-loop-state-transitions-during-port-update-handling.patch
+++ b/queue-3.0/qla2xxx-correct-inadvertent-loop-state-transitions-during-port-update-handling.patch
@@ -15,6 +15,7 @@ internal command-queuing.  Safely remove this state.
 Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
 Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com>
 Signed-off-by: James Bottomley <JBottomley@Parallels.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 ---
  drivers/scsi/qla2xxx/qla_init.c |    3 ---
diff --git a/queue-3.0/series b/queue-3.0/series
index 8cf7aef73b..8bc08bb44c 100644
--- a/queue-3.0/series
+++ b/queue-3.0/series
@@ -139,3 +139,4 @@ iwlagn-fix-command-queue-timeout.patch
 alsa-hda-realtek-fix-auto-mute-with-hp-lo-configuration.patch
 cifs-fix-possible-memory-corruption-in-cifsfindnext.patch
 fix-the-conflict-between-rwpidforward-and-rw-mount-options.patch
+arm-dove-fix-second-spi-initialization-call.patch