[lkml]   [2012]   [May]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    SubjectRe: [PULL REQUEST] i2c-embedded for 3.5

    On 26/05/12 16:06, Wolfram Sang wrote:
    > Note that you will get a trivial merge-conflict because some
    > lpc32xx-patches have already come in via arm-soc to reduce dependencies.
    > I read that you want to see such conflicts so I didn't take any actions.
    > I'll add Arnd and Roland to CC, because they know best about LPC32xx
    > changes.

    There are already some i2c commits in master that came via arm-soc.
    Expect conflicts with some LPC32xx related commits from i2c-embedded.
    They are basically the same patches, applied as different commits
    though, sorry. But should be easy to resolve.


     \ /
      Last update: 2012-05-26 18:01    [W:0.056 / U:39.600 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site