[lkml]   [2009]   [Nov]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    Subjectlinux-next: manual merge of the trivial tree with the tree
    Hi Jiri,

    Today's linux-next merge of the trivial tree got a conflict in
    drivers/net/wireless/rt2x00/rt2800usb.c between commit
    fcf5154118849cca3cdf424e83f863225d8173e7 ("rt2800: add rt2800lib (part
    three)") from the wireless tree and commit
    305409a25f7df3c359ba67cbeb62763eeb7156e9 ("tree-wide: fix some typos and
    punctuation in comments") from the trivial tree.

    The misspelling is moved to a new file
    (drivers/net/wireless/rt2x00/rt2800lib.c), but I didn't bother fixing it up.
    Stephen Rothwell
    [unhandled content-type:application/pgp-signature]
     \ /
      Last update: 2009-11-09 05:45    [W:0.018 / U:2.968 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site