summaryrefslogtreecommitdiff
path: root/net/unix/Makefile
diff options
context:
space:
mode:
authorSrinivas Kandagatla <srinivas.kandagatla@linaro.org>2017-01-27 19:52:37 +0200
committerKalle Valo <kvalo@qca.qualcomm.com>2017-01-27 20:03:27 +0200
commit0de4df5ba2ad3f3c46d2c079f3a76c69d71800be (patch)
treefe0be790ad0edaa195fc4c17801953a21baf11b2 /net/unix/Makefile
parentdd51fa3d8a1d4781647f333e731590b65965b332 (diff)
ath10k: use dma_zalloc_coherent()
use dma_zalloc_coherent() instead of dma_alloc_coherent and memset(). Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Diffstat (limited to 'net/unix/Makefile')
0 files changed, 0 insertions, 0 deletions
a02eed6742 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflict was an interaction between a bug fix in the netvsc driver in 'net' and an optimization of the RX path in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/batman-adv/icmp_socket.h')