]> www.infradead.org Git - users/jedix/linux-maple.git/commit
projects / users / jedix / linux-maple.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: 1d49c6c b65bf13)
Merge branch 'stable/cleanups-3.2.rebased' into uek2-merge
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Wed, 19 Oct 2011 19:49:59 +0000 (15:49 -0400)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Wed, 19 Oct 2011 19:49:59 +0000 (15:49 -0400)
commit259e329005fe701247b68f241e9a8d6806b204ce
tree7dd0c3c11c46bce9f07ca501f5ba1382f7d15685tree
parent1d49c6c2b109b94ae9c30a9ca01f512837baeb97commit | diff
parentb65bf13505c5068b23cac4a6a8331ed23a7b03eecommit | diff
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
drivers/xen/balloon.c diff1 | diff2 | blob | history
drivers/xen/events.c diff1 | diff2 | blob | history
drivers/xen/grant-table.c diff1 | diff2 | blob | history
drivers/xen/pci.c diff1 | diff2 | blob | history
drivers/xen/xenbus/xenbus_probe.c diff1 | diff2 | blob | history
drivers/xen/xenbus/xenbus_probe.h diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.