On Fri, 16 Mar 2012, Stephen Rothwell wrote: > Today's linux-next merge of the trivial tree got a conflict in > drivers/char/viotape.c between commit ba7a4822b48f ("powerpc: Remove some > of the legacy iSeries specific device drivers") from the powerpc tree and > commit a7ccf3775219 ("char: Fix typo in viotape.c") from the trivial tree.
Dropped a7ccf3775219 in my tree, thanks for report Stephen. -- Jiri Kosina SUSE Labs _______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev