2.6.26-rc1-git7

 Documentation

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index a3c3544..cdd5b93 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1094,9 +1094,6 @@ and is between 256 and 4096 characters. It is defined in the file
    mac5380=   [HW,SCSI] Format:
          <can_queue>,<cmd_per_lun>,<sg_tablesize>,<hostid>,<use_tags>
 
-   mac53c9x=   [HW,SCSI] Format:
-         <num_esps>,<disconnect>,<nosync>,<can_queue>,<cmd_per_lun>,<sg_tablesize>,<hostid&g+
t;,<use_tags>
-
    machvec=   [IA64] Force the use of a particular machine-vector
          (machvec) in a generic kernel.
          Example: machvec=hpzx1_swiotlb
@@ -1525,6 +1522,8 @@ and is between 256 and 4096 characters. It is defined in the file
             This is normally done in pci_enable_device(),
             so this option is a temporary workaround
             for broken drivers that don't call it.
+      skip_isa_align   [X86] do not align io start addr, so can
+            handle more pci cards
       firmware   [ARM] Do not re-enumerate the bus but instead
             just use the configuration from the
             bootloader. This is currently used on