summaryrefslogtreecommitdiff
path: root/drivers/pci/pci.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2010-05-06 22:04:31 -0400
committerLen Brown <len.brown@intel.com>2010-05-06 22:04:31 -0400
commit1468cf0542663f873410b83d8bb61ae779e3a845 (patch)
treeb1c4b823c7fe49edfcc017080f7f89747c514fad /drivers/pci/pci.c
parentf238b414a74a13c3d62e31a08e81b585d750df74 (diff)
parent5cc4a0f6b72878ea4e96fdb392d5d24c892a988e (diff)
parentea5bc73f4f56449b2d450068d492bcd17a675d7a (diff)
parent11439a6fd90b4861df64b4f983726e1c54977ab7 (diff)
parent4bdae98f1a456ea1fea5ea02f9249d23bceab75b (diff)
Merge branches 'bugzilla-14337', 'bugzilla-14998', 'bugzilla-15407', 'bugzilla-15903' and 'misc-2.6.34' into release