From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 28 Nov 2012 18:39:19 +0000 (-0700)
Subject: Merge branch 'pci/misc' into next
X-Git-Tag: omap-for-v3.8/fixes-for-merge-window-v4-signed~34^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c282db1656733c1267e6af4c22179bb04faf2ef;p=pandora-kernel.git

Merge branch 'pci/misc' into next

* pci/misc:
  PCI/AER: Report success only when every device has AER-aware driver

Conflicts:
	drivers/pci/pcie/aer/aerdrv_core.c
---

3c282db1656733c1267e6af4c22179bb04faf2ef
Reading git-diff-tree failed