aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-04-28 23:40:17 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-04-28 23:40:17 -0400
commit79dba2eaa771c3173957eccfd288e0e0d12e4d3f (patch)
tree4cafc47b8eaed5d40b2d8705c9f9036fe6b463d3 /fs
parentd9e80b7de91db05c1c4d2e5ebbfd70b3b3ba0e0f (diff)
parent48728e077480910df45baabc5f87b04276348c90 (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: x86/PCI: compute Address Space length rather than using _LEN x86/PCI: never allocate PCI MMIO resources below BIOS_END
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions