- Updated to 2.6.31-rc5.

  - Eliminated 11 patches.

suse-commit: 69e6d0dd3fe16725ca3dd099491838ee7bcbbd18

diff --cc MAINTAINERS
index 3140f27,d6befb2..b6e4e4d
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -6537,16 -5621,8 +5621,15 @@@ S:    Supporte
  F:    Documentation/filesystems/xfs.txt
  F:    fs/xfs/
  
 +DMAPI
 +P:    Silicon Graphics Inc
 +M:    xfs-masters@oss.sgi.com
 +L:    xfs@oss.sgi.com
 +W:    http://oss.sgi.com/projects/xfs
 +S:    Supported
 +
  XILINX SYSTEMACE DRIVER
- P:    Grant Likely
- M:    grant.likely@secretlab.ca
+ M:    Grant Likely <grant.likely@secretlab.ca>
  W:    http://www.secretlab.ca/
  S:    Maintained
  F:    drivers/block/xsysace.c

diff --cc Makefile
Simple merge

diff --cc arch/s390/include/asm/tlb.h
Simple merge

diff --cc arch/x86/kernel/cpu/amd.c
index 9dc5f5b,e2485b0..2ea03ca
--- 1/arch/x86/kernel/cpu/amd.c
--- 2/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@@ -354,9 -354,9 +354,9 @@@ static void __cpuinit early_init_amd(st
                    (c->x86_model == 8 && c->x86_mask >= 8))
                        set_cpu_cap(c, X86_FEATURE_K6_MTRR);
  #endif
 -#if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_PCI)
 +#if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_PCI) && !defined(CONFIG_XEN)
        /* check CPU config space for extended APIC ID */
-       if (c->x86 >= 0xf) {
+       if (cpu_has_apic && c->x86 >= 0xf) {
                unsigned int val;
                val = read_pci_config(0, 24, 0, 0x68);
                if ((val & ((1 << 17) | (1 << 18))) == ((1 << 17) | (1 << 18)))

diff --cc arch/x86/kernel/cpu/mcheck/mce.c
Simple merge

diff --cc arch/x86/kernel/reboot.c
Simple merge

diff --cc arch/x86/kernel/vmlinux.lds.S
Simple merge

diff --cc drivers/acpi/sleep.c
Simple merge

diff --cc drivers/ata/ata_piix.c
Simple merge

diff --cc drivers/ata/libata-core.c
Simple merge

diff --cc drivers/char/n_tty.c
Simple merge

diff --cc drivers/dma/fsldma.c
Simple merge

diff --cc drivers/md/dm-mpath.c
Simple merge

diff --cc drivers/md/dm-table.c
Simple merge

diff --cc drivers/md/dm.c
Simple merge

diff --cc drivers/mmc/host/sdhci-of.c
Simple merge

diff --cc drivers/net/Kconfig
Simple merge

diff --cc drivers/net/fs_enet/fs_enet-main.c
Simple merge

diff --cc drivers/net/gianfar.c
Simple merge

diff --cc drivers/net/phy/mdio-gpio.c
Simple merge

diff --cc drivers/net/ucc_geth.c
Simple merge

diff --cc drivers/platform/x86/acer-wmi.c
Simple merge

diff --cc fs/ext3/inode.c
Simple merge

diff --cc fs/xfs/linux-2.6/xfs_aops.c
Simple merge

diff --cc fs/xfs/linux-2.6/xfs_iops.c
Simple merge

diff --cc include/linux/ext3_fs.h
Simple merge

diff --cc include/linux/fs.h
Simple merge

diff --cc include/linux/libata.h
Simple merge

diff --cc kernel/cgroup.c
Simple merge

diff --cc kernel/kexec.c
Simple merge

diff --cc kernel/module.c
Simple merge

diff --cc mm/hugetlb.c
Simple merge

diff --cc mm/memcontrol.c
Simple merge

diff --cc mm/memory.c
Simple merge

diff --cc mm/page_alloc.c
Simple merge

diff --cc mm/swapfile.c
Simple merge

diff --cc net/bridge/br_if.c
Simple merge

diff --cc net/mac80211/Kconfig
Simple merge

diff --cc sound/pci/hda/patch_realtek.c
Simple merge