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

    Today's linux-next merge of the trivial tree got a conflict in
    drivers/net/wireless/rt2x00/rt2800usb.h between various commits from the
    wireless tree and commit 17530b1c635dfd1f258afc6b07b986b425d66ebd
    ("tree-wide: fix assorted typos all over the place") from the trivial

    The wireless tree commits moved the code fixed by the trivial tree, but
    also fixed it along the way, so I have ignored the trivial fixup for this
    Stephen Rothwell
    [unhandled content-type:application/pgp-signature]
     \ /
      Last update: 2009-11-17 05:53    [W:0.018 / U:6.052 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site