[GIT PULL] (xen) stable/cleanups-3.2 for Linux 3.2-rc0
From: Konrad Rzeszutek Wilk
Date: Mon Oct 24 2011 - 09:14:50 EST
Hey Linus,
Please pull the following branch:
git pull git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen stable/cleanups-3.2
which has some exciting merge conflict patches. These patches are based on
git commit 8ded371 (Merge branch 'for-3.1/drivers' of git://git.kernel.dk/linux-block).
They are patches mostly created from running scripts/checkpatch.pl and fixing things up.
They also cause merge conflicts: git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen linux-next
has the resolution of that - but it should be fairly easy to fix it up.
Please pull!
Olaf Hering (1):
xen: use static initializers in xen-balloon.c
Ruslan Pisarev (6):
Xen: fix whitespaces,tabs coding style issue in drivers/xen/balloon.c
Xen: fix whitespaces,tabs coding style issue in drivers/xen/events.c
Xen: fix braces coding style issue in gntdev.c and grant-table.c
Xen: fix whitespaces,tabs coding style issue in drivers/xen/pci.c
Xen: fix braces coding style issue in xenbus_probe.h
Xen: fix braces and tabs coding style issue in xenbus_probe.c
drivers/xen/balloon.c | 15 +++++++--------
drivers/xen/events.c | 9 ++++-----
drivers/xen/gntdev.c | 3 +--
drivers/xen/grant-table.c | 2 +-
drivers/xen/pci.c | 4 ++--
drivers/xen/xen-balloon.c | 17 ++++++++---------
drivers/xen/xenbus/xenbus_probe.c | 7 +++----
drivers/xen/xenbus/xenbus_probe.h | 3 +--
8 files changed, 27 insertions(+), 33 deletions(-)
Attachment:
pgp00000.pgp
Description: PGP signature