Merge of Xiphos 3.6 PCI kernel code into 3.12