- Update to 3.0-rc7.

suse-commit: 0de37e18993ef84fbbbe2c66b2bf84cea4ec7499

diff --cc Documentation/kernel-parameters.txt
index f2105cc,aa47be7..0c3b065
--- 1/Documentation/kernel-parameters.txt
--- 2/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -2033,14 -2015,9 +2033,16 @@@ bytes respectively. Such letter suffixe
                                the default.
                                off: Turn ECRC off
                                on: Turn ECRC on.
+               realloc         reallocate PCI resources if allocations done by BIOS
+                               are erroneous.
  
 +      pci_reserve=    [PCI]
 +                      Format: [<sbdf>[+IO<size>][+MEM<size>]][,<sbdf>...]
 +                      Format of sbdf: [<segment>:]<bus>:<dev>.<func>
 +                      Specifies the least reserved io size or memory size
 +                      which is assigned to PCI bridge even when no child
 +                      pci device exists. This is useful with PCI hotplug.
 +
        pcie_aspm=      [PCIE] Forcibly enable or disable PCIe Active State Power
                        Management.
                off     Disable ASPM.

diff --cc Makefile
Simple merge

diff --cc drivers/pci/pci.c
Simple merge

diff --cc drivers/pci/pci.h
Simple merge

diff --cc drivers/pci/setup-bus.c
Simple merge

diff --cc kernel/sched.c
Simple merge

diff --cc mm/memory.c
Simple merge