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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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.
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgpyMNXYBKWSp.pgp
Description: PGP signature

[Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Photo]     [Yosemite News]    [Yosemite Photos]    [Free Online Dating]     [Linux Kernel]     [Linux SCSI]     [XFree86]

Add to Google Powered by Linux