Messages in this thread | | | Date | Fri, 16 Mar 2012 14:56:58 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the trivial tree with the powerpc tree |
| |
Hi Jiri,
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.
The former commit removed the file, so I did that. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |