lkml.org 
[lkml]   [2013]   [Sep]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Subjectlinux-next: manual merge of the tip tree
Date
Today's linux-next merge of the tip tree got conflicts in

arch/h8300/include/asm/Kbuild

I just removed the file.

Thanks,
Thierry


\
 
 \ /
  Last update: 2013-09-30 14:01    [W:0.057 / U:0.472 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site