]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'vhost/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Apr 2015 08:06:24 +0000 (18:06 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Apr 2015 08:06:24 +0000 (18:06 +1000)
commitf7a4c1ac6133d5e04ae7ffd418ad954b9630f472
tree905cb8c7a0a4e5166fc96174d85fb7c7a1c42d8d
parent08b7e3f87e99054d01ea45317fdb4850b41c78bb
parentdd29714ec856b2efc327db825c0cbd2002b38340
Merge remote-tracking branch 'vhost/linux-next'

Conflicts:
drivers/usb/dwc3/dwc3-pci.c
drivers/crypto/ccp/ccp-ops.c
drivers/media/rc/fintek-cir.c
drivers/net/macvtap.c
drivers/net/tun.c
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
drivers/net/wireless/brcm80211/brcmfmac/sdio.c
drivers/pci/pci.c
drivers/pci/pci.h
drivers/pci/probe.c
drivers/pci/quirks.c
include/linux/pci.h