On Mon, Dec 03, 2012 at 05:12:32PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the arm-soc tree got a conflict in
> drivers/dma/mv_xor.c between commit d51e88b99533 ("dma: Convert dev_printk
> (KERN_ to dev_(") from the slave-dma tree, commits
> a7d6e3ec28bb ("dma:
On Mon, Dec 03, 2012 at 05:12:32PM +1100, Stephen Rothwell wrote:
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
drivers/dma/mv_xor.c between commit d51e88b99533 (dma: Convert dev_printk
(KERN_LEVEL to dev_level() from the slave-dma tree, commits
a7d6e3ec28bb (dma:
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
drivers/dma/mv_xor.c between commit d51e88b99533 ("dma: Convert dev_printk
(KERN_ to dev_(") from the slave-dma tree, commits
a7d6e3ec28bb ("dma: remove use of __devexit_p") and 463a1f8b3cee ("dma:
remove use of __devinit")
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
drivers/dma/mv_xor.c between commit d51e88b99533 (dma: Convert dev_printk
(KERN_LEVEL to dev_level() from the slave-dma tree, commits
a7d6e3ec28bb (dma: remove use of __devexit_p) and 463a1f8b3cee (dma:
remove use of
4 matches
Mail list logo