commit daedd8708fe7707ed651bb1c83162f25c48a947c
author Linus Torvalds <torvalds@linux-foundation.org> Sun Nov 06 20:13:34 2011 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> Sun Nov 06 20:13:34 2011 -0800
tree 424e9aaa7d6f686b729257e753e4edf91fecb73c
parent 6a6662ced4153f6dbcfc40d7225c3cc45416039c
parent 6b71c52e7f848e2c9f804e175215e5965ea90d32

Merge branch 'stable/cleanups-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen

* 'stable/cleanups-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen: use static initializers in xen-balloon.c
  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

Fix up trivial whitespace-conflicts in
 drivers/xen/{balloon.c,pci.c,xenbus/xenbus_probe.c}