4 files changed, 44 insertions, 3 deletions

diff --git a/Documentation/DocBook/scsi.tmpl b/Documentation/DocBook/scsi.tmpl
index f299ab182bbe..10a150ae2a7e 100644
--- a/Documentation/DocBook/scsi.tmpl
+++ b/Documentation/DocBook/scsi.tmpl
@@ -12,7 +12,7 @@
         <surname>Bottomley</surname>
         <affiliation>
           <address>
-            <email>James.Bottomley@steeleye.com</email>
+            <email>James.Bottomley@hansenpartnership.com</email>
           </address>
         </affiliation>
       </author>
diff --git a/Documentation/input/input-programming.txt b/Documentation/input/input-programming.txt
index 47fc86830cd7..81905e81585e 100644
--- a/Documentation/input/input-programming.txt
+++ b/Documentation/input/input-programming.txt
@@ -22,7 +22,7 @@ static struct input_dev *button_dev;
 
 static void button_interrupt(int irq, void *dummy, struct pt_regs *fp)
 {
-        input_report_key(button_dev, BTN_1, inb(BUTTON_PORT) & 1);
+        input_report_key(button_dev, BTN_0, inb(BUTTON_PORT) & 1);
         input_sync(button_dev);
 }
 
diff --git a/Documentation/scsi/ChangeLog.arcmsr b/Documentation/scsi/ChangeLog.arcmsr
index cd8403a33ee6..de2bcacfa870 100644
--- a/Documentation/scsi/ChangeLog.arcmsr
+++ b/Documentation/scsi/ChangeLog.arcmsr
@@ -68,4 +68,45 @@
 **                                              2. modify the arcmsr_pci_slot_reset function
 **                                              3. modify the arcmsr_pci_ers_disconnect_forepart function
 **                                              4. modify the arcmsr_pci_ers_need_reset_forepart function
+** 1.20.00.15   09/27/2007       Erich Chen & Nick Cheng
+**                                              1. add arcmsr_enable_eoi_mode() on adapter Type B
+**                                              2. add readl(reg->iop2drv_doorbell_reg) in arcmsr_handle_hbb_isr()
+**                                              in case of the doorbell interrupt clearance is cached
+** 1.20.00.15   10/01/2007       Erich Chen & Nick Cheng
+**                                              1. modify acb->devstate[i][j]
+**                                              as ARECA_RAID_GOOD instead of
+**                                              ARECA_RAID_GONE in arcmsr_alloc_ccb_pool
+** 1.20.00.15   11/06/2007       Erich Chen & Nick Cheng
+**                                              1. add conditional declaration for
+**                                              arcmsr_pci_error_detected() and
+**                                              arcmsr_pci_slot_reset
+** 1.20.00.15   11/23/2007       Erich Chen & Nick Cheng
+**                                              1.check if the sg list member number
+**                                              exceeds arcmsr default limit in arcmsr_build_ccb()
+**                                              2.change the returned value type of arcmsr_build_ccb()
+**                                              from "void" to "int"
+**                                              3.add the conditional check if arcmsr_build_ccb()
+**                                              returns FAILED
+** 1.20.00.15   12/04/2007       Erich Chen & Nick Cheng
+**                                              1. modify arcmsr_drain_donequeue() to ignore unknown
+**                                              command and let kernel process command timeout.
+**                                              This could handle IO request violating max. segments
+**                                              while Linux XFS over DM-CRYPT.
+**                                              Thanks to Milan Broz's comments <mbroz@redhat.com>
+** 1.20.00.15   12/24/2007       Erich Chen & Nick Cheng
+**                                              1.fix the portability problems
+**                                              2.fix type B where we should _not_ iounmap() acb->pmu;
+**                                              it's not ioremapped.
+**                                              3.add return -ENOMEM if ioremap() fails
+**                                              4.transfer IS_SG64_ADDR w/ cpu_to_le32()
+**                                              in arcmsr_build_ccb
+**                                              5. modify acb->devstate[i][j] as ARECA_RAID_GONE instead of
+**                                              ARECA_RAID_GOOD in arcmsr_alloc_ccb_pool()
+**                                              6.fix arcmsr_cdb->Context as (unsigned long)arcmsr_cdb
+**                                              7.add the checking state of
+**                                              (outbound_intstatus & ARCMSR_MU_OUTBOUND_HANDLE_INT) == 0
+**                                              in arcmsr_handle_hba_isr
+**                                              8.replace pci_alloc_consistent()/pci_free_consistent() with kmalloc()/kfree() in arcmsr_iop_message_xfer()
+**                                              9. fix the release of dma memory for type B in arcmsr_free_ccb_pool()
+**                                              10.fix the arcmsr_polling_hbb_ccbdone()
 **************************************************************************
diff --git a/Documentation/scsi/scsi_mid_low_api.txt b/Documentation/scsi/scsi_mid_low_api.txt
index 6f70f2b9327e..a6d5354639b2 100644
--- a/Documentation/scsi/scsi_mid_low_api.txt
+++ b/Documentation/scsi/scsi_mid_low_api.txt
@@ -1407,7 +1407,7 @@ Credits
 =======
 The following people have contributed to this document:
         Mike Anderson <andmike at us dot ibm dot com>
-        James Bottomley <James dot Bottomley at steeleye dot com> 
+        James Bottomley <James dot Bottomley at hansenpartnership dot com>
         Patrick Mansfield <patmans at us dot ibm dot com> 
         Christoph Hellwig <hch at infradead dot org>
         Doug Ledford <dledford at redhat dot com>