lkml.org 
[lkml]   [2013]   [Jan]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    From
    SubjectRE: linux-next: manual merge of the samsung tree with the arm-soc tree
    Date
    Stephen Rothwell wrote:
    >
    > Hi Kukjin,
    >
    Hi,

    > On Fri, 11 Jan 2013 15:32:06 +1100 Stephen Rothwell <sfr@canb.auug.org.au>
    > wrote:
    > >
    > > Today's linux-next merge of the samsung tree got conflicts in
    > > many files with the arm-soc tree.
    > >
    > > I just dropped the samsung tree for today. Please have a look and try
    to
    > > fix this mess up, thanks.
    >
    > Ping?
    >
    Oops, I missed above e-mail. Anyway, really?

    Let me look at soon and I will fix.

    Thanks for your information.

    - Kukjin



    \
     
     \ /
      Last update: 2013-01-17 05:41    [W:3.774 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site