lkml.org 
[lkml]   [2011]   [May]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the async_tx tree with Linus' tree
Hi Dan,

Today's linux-next merge of the async_tx tree got a conflict in
drivers/dma/dw_dmac.c between commit e05503ef1186 ("Haavard Skinnemoen
has left Atmel") from Linus' tree and commit aecb7b64dd9e
("dmaengine/dw_dmac: Update maintainer-ship") from the async_tx tree.

Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

diff --cc drivers/dma/dw_dmac.c
index 2a2e2fa,efd836d..0000000
--- a/drivers/dma/dw_dmac.c
+++ b/drivers/dma/dw_dmac.c
@@@ -1486,4 -1575,5 +1575,5 @@@ module_exit(dw_exit)

MODULE_LICENSE("GPL v2");
MODULE_DESCRIPTION("Synopsys DesignWare DMA Controller driver");
-MODULE_AUTHOR("Haavard Skinnemoen <haavard.skinnemoen@atmel.com>");
+MODULE_AUTHOR("Haavard Skinnemoen (Atmel)");
+ MODULE_AUTHOR("Viresh Kumar <viresh.kumar@st.com>");


\
 
 \ /
  Last update: 2011-05-27 05:33    [W:0.049 / U:0.860 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site