]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'stable/bug.fixes-3.2' into linux-next
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Thu, 29 Sep 2011 21:23:29 +0000 (17:23 -0400)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Thu, 29 Sep 2011 21:23:29 +0000 (17:23 -0400)
commita3ff69a4704245a8de1fe5c3ee9906cbabbf58e1
tree41597974d7ddca67ec4d06faa176ec74ba4edaf9
parente59e21d4d7abe3158297f09f724b4b26dca29885
parent1b93dee68ca62a33fd6b5e3d738088fa3490a96d
Merge branch 'stable/bug.fixes-3.2' into linux-next

* stable/bug.fixes-3.2:
  xen/p2m/debugfs: Fix potential pointer exception.
  xen/enlighten: Fix compile warnings.
  xen/xenbus: Check before dereferencing it.
  xen/irq: If we fail during msi_capability_init return proper error code.
  xen/events: Don't check the info for NULL as it is already done.
  xen/events: BUG() when we can't allocate our event->irq array.
  xen/pciback: Check if the device is found instead of blindly assuming so.
  xen/pciback: Return proper error code from sscanf.
  xen/pciback: Do not dereference psdev during printk when it is NULL.

Conflicts:
drivers/xen/xen-pciback/pci_stub.c
arch/x86/pci/xen.c
arch/x86/xen/p2m.c
drivers/xen/events.c
drivers/xen/xen-pciback/pci_stub.c