Merge branch 'dmaengine' into async-tx-next

Conflicts:
	crypto/async_tx/async_xor.c
	drivers/dma/ioat/dma_v2.h
	drivers/dma/ioat/pci.c
	drivers/md/raid5.c

1 files changed, 1 insertions, 1 deletions

diff --git a/net/tipc/eth_media.c b/net/tipc/eth_media.c
index f72ba774c246..524ba5696d4d 100644
--- a/net/tipc/eth_media.c
+++ b/net/tipc/eth_media.c
@@ -167,7 +167,7 @@ static int enable_bearer(struct tipc_bearer *tb_ptr)
         tb_ptr->mtu = dev->mtu;
         tb_ptr->blocked = 0;
         tb_ptr->addr.type = htonl(TIPC_MEDIA_TYPE_ETH);
-        memcpy(&tb_ptr->addr.dev_addr, &dev->dev_addr, ETH_ALEN);
+        memcpy(&tb_ptr->addr.dev_addr, dev->dev_addr, ETH_ALEN);
         return 0;
 }