[lkml]   [2015]   [Feb]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: [GIT PULL 5/7] ARM: SoC driver updates
On Tue, Feb 17, 2015 at 12:33 AM, Olof Johansson <> wrote:
> Conflicts:
> arch/arm/boot/dts/rk3288.dtsi: add/add: Keep both sides

You mixed up the aliases of this pull and the previous DT pull.

Not a real problem, but while resolving the DT aliases (which you
claimed had "No conflicts") I was wondering just what you had been


 \ /
  Last update: 2015-02-17 19:01    [W:0.041 / U:2.172 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site