diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-12 23:38:34 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-12 23:38:34 +0200 |
commit | 2caa731819a633bec5a56736e64c562b7e193666 (patch) | |
tree | e93f5c50c33c7cf5a9cc3ea29dd1d868b4f14d5c /drivers/mtd/mtdcore.c | |
parent | Merge master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
parent | PCI: Prevent AER driver from being loaded on non-root port PCIE devices (diff) | |
download | linux-2caa731819a633bec5a56736e64c562b7e193666.tar.xz linux-2caa731819a633bec5a56736e64c562b7e193666.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
PCI: Prevent AER driver from being loaded on non-root port PCIE devices
PCI: get larger bridge ranges when space is available
PCI: pci.c: fix kernel-doc notation
PCI quirk: TI XIO200a erroneously reports support for fast b2b transfers
PCI PM: Read device power state from register after updating it
PCI: remove pci_assign_resource_fixed()
PCI: PCIe portdrv: remove "-driver" from driver name
Diffstat (limited to 'drivers/mtd/mtdcore.c')
0 files changed, 0 insertions, 0 deletions