From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 7 Nov 2011 04:13:34 +0000 (-0800)
Subject: Merge branch 'stable/cleanups-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.2-rc1~20
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=daedd8708fe7707ed651bb1c83162f25c48a947c;p=pandora-kernel.git

Merge branch 'stable/cleanups-3.2' of git://git./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}
---

daedd8708fe7707ed651bb1c83162f25c48a947c
Reading git-diff-tree failed