Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  x86 PCI: call dmi_check_pciprobe()
  x86/pci: add pci=skip_isa_align command lines.
  x86/pci: remove flag in pci_cfg_space_size_ext
  x86: fix section mismatch in pci_scan_bus

diff --combined Documentation/kernel-parameters.txt
index b2dd3dc,15d8216..cdd5b93
--- 1/Documentation/kernel-parameters.txt
--- 2/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -496,11 -496,6 +496,11 @@@ and is between 256 and 4096 characters
                        switching to the matching ttyS device later.  The
                        options are the same as for ttyS, above.
  
 +                If the device connected to the port is not a TTY but a braille
 +                device, prepend "brl," before the device type, for instance
 +                      console=brl,ttyS0
 +              For now, only VisioBraille is supported.
 +
        earlycon=       [KNL] Output early console device and options.
                uart[8250],io,<addr>[,options]
                uart[8250],mmio,<addr>[,options]
@@@ -561,8 -556,6 +561,8 @@@
                        1 will print _a lot_ more information - normally
                        only useful to kernel developers.
  
 +      debug_objects   [KNL] Enable object debugging
 +
        decnet.addr=    [HW,NET]
                        Format: <area>[,<node>]
                        See also Documentation/networking/decnet.txt.
@@@ -1094,6 -1087,9 +1094,6 @@@
        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>,<use_tags>
 -
        machvec=        [IA64] Force the use of a particular machine-vector
                        (machvec) in a generic kernel.
                        Example: machvec=hpzx1_swiotlb
@@@ -1522,6 -1518,8 +1522,8 @@@
                                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