diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-22 20:26:00 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-22 20:26:00 +0200 |
commit | 9b60afee50425064fa0a69bea22f07b6ea55ebc1 (patch) | |
tree | 7e570ffc883dc4517c6d01bb7445480ba294494e /CREDITS | |
parent | Merge git://www.linux-watchdog.org/linux-watchdog (diff) | |
parent | ia64/PCI: Treat all host bridge Address Space Descriptors (even consumers) as... (diff) | |
download | linux-9b60afee50425064fa0a69bea22f07b6ea55ebc1.tar.xz linux-9b60afee50425064fa0a69bea22f07b6ea55ebc1.zip |
Merge tag 'pci-v4.1-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI fixes from Bjorn Helgaas:
"These fix an ia64 regression caused by tighter resource checking we
merged during the merge window and remove an invalid email address
from MAINTAINERS.
Resource management:
- ia64: Treat all Address Space Descriptors as windows (Bjorn Helgaas)
Miscellaneous:
- MAINTAINERS: Remove Mohit Kumar (email bounces) (Bjorn Helgaas)"
* tag 'pci-v4.1-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
ia64/PCI: Treat all host bridge Address Space Descriptors (even consumers) as windows
MAINTAINERS: Remove Mohit Kumar (email bounces)
Diffstat (limited to 'CREDITS')
-rw-r--r-- | CREDITS | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -2049,6 +2049,10 @@ D: pirq addr, CS5535 alsa audio driver S: Gurgaon, India S: Kuala Lumpur, Malaysia +N: Mohit Kumar +D: ST Microelectronics SPEAr13xx PCI host bridge driver +D: Synopsys Designware PCI host bridge driver + N: Gabor Kuti M: seasons@falcon.sch.bme.hu M: seasons@makosteszta.sote.hu |