diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-16 01:47:55 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-16 01:47:55 +0200 |
| commit | 72357d59559e3b9293bdea9c0d755862504f2bf3 (patch) | |
| tree | 3a047c436154201bfa5bf8682b9379e718d7dcc3 /Makefile | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6 (diff) | |
| parent | PCI MSI: Fix MSI-X with NIU cards (diff) | |
| download | linux-72357d59559e3b9293bdea9c0d755862504f2bf3.tar.xz linux-72357d59559e3b9293bdea9c0d755862504f2bf3.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 MSI: Fix MSI-X with NIU cards
PCI: Fix pci-e port driver slot_reset bad default return value
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions