www.infradead.org Git - users/jedix/linux-maple.git/commit

author	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
	Thu, 2 Feb 2012 19:05:49 +0000 (14:05 -0500)
committer	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
	Thu, 2 Feb 2012 19:05:49 +0000 (14:05 -0500)
commit	5de2b14e3fdd19756a390b141d2d06d4a1be75ec
tree	6490c9ede92742fac5b8673ef5e404458cce4194	tree
parent	5b50df4d341986384148bb2f7785ff58846b688a	commit \| diff
parent	b65bf13505c5068b23cac4a6a8331ed23a7b03ee	commit \| diff

Merge branch 'stable/cleanups-3.2.rebased' into stable/for-linus-3.3.rebased

* 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/balloon.c
drivers/xen/gntdev.c

drivers/xen/balloon.c	diff1 \|	diff2 \|	blob \| history
drivers/xen/events.c	diff1 \|	diff2 \|	blob \| history
drivers/xen/gntdev.c	diff1 \|	diff2 \|	blob \| history
drivers/xen/grant-table.c	diff1 \|	diff2 \|	blob \| history