Merge branch 'smsc911x-armplatforms' of git://github.com/steveglen/linux-2.6

diff --combined Documentation/kernel-parameters.txt
index 73fa52c0df28e9cd9e6cdfa35881207ecfc5d5c7,240257dd4238fc55608989541b79c37e40101abc..bdc0c433e88c6852898220a1c11f63c29f89b41d
--- 1/Documentation/kernel-parameters.txt
--- 2/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -492,6 -492,16 +492,16 @@@ and is between 256 and 4096 characters
                        Range: 0 - 8192
                        Default: 64
  
+       dma_debug=off   If the kernel is compiled with DMA_API_DEBUG support
+                       this option disables the debugging code at boot.
+ 
+       dma_debug_entries=<number>
+                       This option allows to tune the number of preallocated
+                       entries for DMA-API debugging code. One entry is
+                       required per DMA-API allocation. Use this if the
+                       DMA-API debugging code disables itself because the
+                       architectural default is too low.
+ 
        hpet=           [X86-32,HPET] option to control HPET usage
                        Format: { enable (default) | disable | force |
                                verbose }
@@@ -1513,9 -1523,7 +1523,9 @@@
  
        noclflush       [BUGS=X86] Don't use the CLFLUSH instruction
  
 -      nohlt           [BUGS=ARM,SH]
 +      nohlt           [BUGS=ARM,SH] Tells the kernel that the sleep(SH) or
 +                      wfi(ARM) instruction doesn't work correctly and not to
 +                      use it. This is also useful when using JTAG debugger.
  
        no-hlt          [BUGS=X86-32] Tells the kernel that the hlt
                        instruction doesn't work correctly and not to
@@@ -1687,6 -1695,8 +1697,8 @@@
                        See also Documentation/blockdev/paride.txt.
  
        pci=option[,option...]  [PCI] various PCI subsystem options:
+               earlydump       [X86] dump PCI config space before the kernel
+                               changes anything
                off             [X86] don't probe for the PCI bus
                bios            [X86-32] force use of PCI BIOS, don't access
                                the hardware directly. Use this if your machine
@@@ -1786,6 -1796,15 +1798,15 @@@
                cbmemsize=nn[KMG]       The fixed amount of bus space which is
                                reserved for the CardBus bridge's memory
                                window. The default value is 64 megabytes.
+               resource_alignment=
+                               Format:
+                               [<order of align>@][<domain>:]<bus>:<slot>.<func>[; ...]
+                               Specifies alignment and device to reassign
+                               aligned memory resources.
+                               If <order of align> is not specified,
+                               PAGE_SIZE is used as alignment.
+                               PCI-PCI bridge can be specified, if resource
+                               windows need to be expanded.
  
        pcie_aspm=      [PCIE] Forcibly enable or disable PCIe Active State Power
                        Management.