aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64/include/asm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-11-07 12:18:14 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2008-11-07 12:18:14 -0500
commit8ec96e7bba2b8fa339b666354dffe3f47b9fa074 (patch)
tree133e83776ab622259b5a8f852f75934822c09c93 /arch/ia64/include/asm
parentcb110171a65c5a2d85ec814d498986db611040fd (diff)
parent88e7df0b7ee717f9db3333fb1248827bbdb2d4d3 (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/ia64/include/asm')
0 files changed, 0 insertions, 0 deletions