[IA64] Manual merge fix for 3 files
[pandora-kernel.git] / arch / ia64 / pci /
drwxr-xr-x   ..
-rw-r--r-- 74 Makefile
-rw-r--r-- 18175 pci.c