linux-next: manual merge of the trivial tree with the powerpc tree

Jiri Kosina jkosina at
Fri Mar 16 22:10:25 EST 2012

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

More information about the Linuxppc-dev mailing list