Merge branch 'pci/yinghai-eisa' into for-linus