Merge branch 'stable/for-linus-3.6.rebased' into uek2-merge

* stable/for-linus-3.6.rebased:
  xen/boot: Disable BIOS SMP MP table search.
  xen/m2p: do not reuse kmap_op->dev_bus_addr
  xen/setup: Fix one-off error when adding for-balloon PFNs to the P2M.

Conflicts:
	arch/x86/xen/enlighten.c

diff --cc arch/x86/xen/enlighten.c
index 064bb98c6d824308674f19bc13db6e8aac46941a,2fd7ffe842bbdc8376434da77a5bc91ac9b1ff33..a2f7ab6b6383538c8b97cd1dfd1dd365401207e5
--- 1/arch/x86/xen/enlighten.c
--- 2/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@@ -1492,9 -1342,10 +1492,13 @@@ asmlinkage void __init xen_start_kernel
  
                /* Make sure ACS will be enabled */
                pci_request_acs();
 +              
 +              xen_init_apic();
 +              xen_acpi_sleep_register();
+ 
+               /* Avoid searching for BIOS MP tables */
+               x86_init.mpparse.find_smp_config = x86_init_noop;
+               x86_init.mpparse.get_smp_config = x86_init_uint_noop;
        }
  #ifdef CONFIG_PCI
        /* PCI BIOS service won't work from a PV guest. */

diff --cc arch/x86/xen/p2m.c
Simple merge

diff --cc arch/x86/xen/setup.c
Simple merge

diff --cc drivers/block/xen-blkback/blkback.c
Simple merge

diff --cc drivers/xen/gntdev.c
Simple merge