David S. Miller 08a6ee5807 Merge tag 'net-next-qcom-soc-4.7-2-merge' of git://github.com/andersson/kernel ...

Merge tag 'qcom-soc-for-4.7-2' into net-next

This merges the Qualcomm SOC tree with the net-next, solving the
merge conflict in the SMD API between the two.

2016-05-17 14:11:19 -04:00

..

Kconfig

net: qrtr: fix build problems

2016-05-16 13:44:58 -04:00

Makefile

net: qrtr: fix build problems

2016-05-16 13:44:58 -04:00

qrtr.c

net: Add Qualcomm IPC router

2016-05-08 23:46:14 -04:00

qrtr.h

net: Add Qualcomm IPC router

2016-05-08 23:46:14 -04:00

smd.c

Merge tag 'qcom-soc-for-4.7-2' into net-next

2016-05-13 14:42:23 -07:00