[lkml]   [2012]   [Mar]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    SubjectRe: linux-next: manual merge of the char-misc tree with the powerpc tree
    On Fri, Mar 16, 2012 at 04:52:07PM +1100, Stephen Rothwell wrote:
    > Hi all,
    > Today's linux-next merge of the char-misc 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 5fb15db4376f ("char: Fix typo in viotape.c") from the char-misc
    > tree.
    > The former removed this file, so I did that.

    Sounds good to me, thanks.

    greg k-h

     \ /
      Last update: 2012-03-16 16:31    [W:0.019 / U:40.796 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site