diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-07 09:18:14 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-07 09:18:14 -0800 |
commit | 8ec96e7bba2b8fa339b666354dffe3f47b9fa074 (patch) | |
tree | 133e83776ab622259b5a8f852f75934822c09c93 /arch/x86/kernel | |
parent | cb110171a65c5a2d85ec814d498986db611040fd (diff) | |
parent | 88e7df0b7ee717f9db3333fb1248827bbdb2d4d3 (diff) |
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: fix range check on mmapped sysfs resource files
PCI: remove excess kernel-doc notation
PCI: annotate return value of pci_ioremap_bar with __iomem
PCI: fix VPD limit quirk for Broadcom 5708S
Diffstat (limited to 'arch/x86/kernel')
0 files changed, 0 insertions, 0 deletions