Merge branch 'stable/cleanups-3.2.rebased' into uek2-merge

* stable/cleanups-3.2.rebased:
  Xen: fix braces and tabs coding style issue in xenbus_probe.c
  Xen: fix braces coding style issue in xenbus_probe.h
  Xen: fix whitespaces,tabs coding style issue in drivers/xen/pci.c
  Xen: fix braces coding style issue in gntdev.c and grant-table.c
  Xen: fix whitespaces,tabs coding style issue in drivers/xen/events.c
  Xen: fix whitespaces,tabs coding style issue in drivers/xen/balloon.c

Conflicts:
	drivers/xen/pci.c

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

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

diff --cc drivers/xen/grant-table.c
Simple merge

diff --cc drivers/xen/pci.c
index 66057075d6e2664c4411b5168c17ba3ac1828938,c4448ee5595f92ae582168f8c064f42e608d89b4..b1923dcb38113d9c003825cb73a64679edb5a3f0
--- 1/drivers/xen/pci.c
--- 2/drivers/xen/pci.c
+++ b/drivers/xen/pci.c
@@@ -96,9 -36,9 +96,9 @@@ static int xen_add_device(struct devic
                struct physdev_manage_pci_ext manage_pci_ext = {
                        .bus            = pci_dev->bus->number,
                        .devfn          = pci_dev->devfn,
-                       .is_virtfn      = 1,
+                       .is_virtfn      = 1,
 -                      .physfn.bus     = pci_dev->physfn->bus->number,
 -                      .physfn.devfn   = pci_dev->physfn->devfn,
 +                      .physfn.bus     = physfn->bus->number,
 +                      .physfn.devfn   = physfn->devfn,
                };
  
                r = HYPERVISOR_physdev_op(PHYSDEVOP_manage_pci_add_ext,

diff --cc drivers/xen/xenbus/xenbus_probe.c
Simple merge

diff --cc drivers/xen/xenbus/xenbus_probe.h
Simple merge