summaryrefslogtreecommitdiffstats
path: root/arch/ppc/kernel/pci.c
diff options
context:
space:
mode:
authorJames Bottomley <jejb@titanic.(none)>2005-11-04 22:29:52 -0600
committerJames Bottomley <jejb@titanic.(none)>2005-11-04 22:29:52 -0600
commit849a8924a6740ecbf9711e015beca69425f0c429 (patch)
tree2bae44c5fb170a655696b7253eec7ee13c6fa437 /arch/ppc/kernel/pci.c
parent7015faa7df829876a0f931cd18aa6d7c24a1b581 (diff)
parentee807c2d43b54183c16580857837dae8ccb2ed22 (diff)
downloadblackbird-op-linux-849a8924a6740ecbf9711e015beca69425f0c429.tar.gz
blackbird-op-linux-849a8924a6740ecbf9711e015beca69425f0c429.zip
Merge by Hand
Conflicts in dec_esp.c (Thanks Bacchus), scsi_transport_iscsi.c and scsi_transport_fc.h Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'arch/ppc/kernel/pci.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud