[lkml]   [2010]   [Oct]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    SubjectRe: linux-next: manual merge of the usb tree with the trivial tree
    On Wed, Oct 06, 2010 at 09:19:27AM +0300, Felipe Balbi wrote:
    > On Tue, Oct 05, 2010 at 10:14:14PM -0500, Stephen Rothwell wrote:
    > >Hi Greg,
    > >
    > >Today's linux-next merge of the usb tree got a conflict in
    > >drivers/usb/musb/musb_gadget.c between commit
    > >7f26b3a7533bbc1ddd88b297c935ee4da8f74cea ("drivers/usb: Remove
    > >unnecessary return's from void functions") from the trivial tree and
    > funny that I wasn't CCed to that one :-(

    It was 'trivial' patches, which don't always get sent to the individual
    developer unfortunately.


    greg k-h

     \ /
      Last update: 2010-10-06 16:15    [W:0.017 / U:4.036 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site