lkml.org 
[lkml]   [2009]   [Jun]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: Tree for June 18
> Merging acpi/test
> CONFLICT (content): Merge conflict in drivers/platform/x86/Kconfig
> CONFLICT (content): Merge conflict in drivers/platform/x86/toshiba_acpi.c

Okay, I've dropped the toshiba_acpi branch from test, pending a refresh

> [master 28e994e] Revert "Merge branch 'oqo-wmi-EXPECT-REFRESH' into test"

Okay, I've dropped the oqo branch from test, pending a refresh

> CONFLICT (content): Merge conflict in drivers/platform/x86/eeepc-laptop.c

As I've sync'd my test tree with Linus' tree in preparation for
a merge, it seems that I need a refreshed eeepc-laptop branch too:-(

thanks,
-Len Brown, Intel Open Source Technology Center




\
 
 \ /
  Last update: 2009-06-18 08:29    [W:0.053 / U:0.028 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site