summaryrefslogtreecommitdiff
path: root/drivers/vfio/pci/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-03-17 12:58:11 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-03-17 12:58:11 -0700
commit3c0b8d1c5f334d1fd0c7eafc18bfb4ab0087b165 (patch)
treec3eef3a06a812d42f83c4fdb6ee0757b1f510c3a /drivers/vfio/pci/Makefile
parent9cc984e4bc089cd21b715b92ffe2d2bda0bb1d1a (diff)
parent87d99063be016ceee90723a13365a40b21eec0d9 (diff)
Merge tag 'hsi-for-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi
Pull HSI updates from Sebastian Reichel: "nokia-modem: add N950 and N9 support" * tag 'hsi-for-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi: HSI: ssi-protocol: Use handshake logic from n950 HSI: nokia-modem: add n950 and n9 support
Diffstat (limited to 'drivers/vfio/pci/Makefile')
0 files changed, 0 insertions, 0 deletions