From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 4 Aug 2015 16:27:19 +0000 (-0700)
Subject: Merge tag 'pci-v4.2-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
X-Git-Tag: v4.2-rc6~22
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6c84461c0cb0db3f4f56695ac9944451b34bf431;p=platform%2Fkernel%2Flinux-exynos.git

Merge tag 'pci-v4.2-fixes-1' of git://git./linux/kernel/git/helgaas/pci

Pull PCI fix from Bjorn Helgaas:
 "This is a trivial fix for a change that broke user program compilation
  (QEMU in this case)"

* tag 'pci-v4.2-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  PCI: Restore PCI_MSIX_FLAGS_BIRMASK definition
---

6c84461c0cb0db3f4f56695ac9944451b34bf431