Merge branch 'master' into SLE11-SP1

suse-commit: e55dc2b73dc1e1eabb3de0744f77fd728ec520a3
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index f1e07c0..14a0f71 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -20,7 +20,7 @@
 /*
  * Driver version
  */
-static char qla4xxx_version_str[40];
+char qla4xxx_version_str[40];
 EXPORT_SYMBOL_GPL(qla4xxx_version_str);
 
 /*