On 2014/1/5 10:05, David Miller wrote: > From: Yijing Wang <wangyijing@xxxxxxxxxx> > Date: Wed, 11 Dec 2013 14:00:26 +0800 > >> Use dev_is_pci() instead of checking bus type directly. >> >> Signed-off-by: Yijing Wang <wangyijing@xxxxxxxxxx> >> Signed-off-by: Bjorn Helgaas <bhelgaas@xxxxxxxxxx> > > Applied. > > Hi David, This patch has been merged in Bjorn's pci tree, so will have some conflict between yours and Bjorn's tree? -- Thanks! Yijing -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
