lkml.org 
[lkml]   [2013]   [Jan]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the drivers-x86 tree with the driver-core.current tree
Hi Matthew,

Today's linux-next merge of the drivers-x86 tree got conflicts in
drivers/platform/x86/apple-gmux.c, drivers/platform/x86/compal-laptop.c,
drivers/platform/x86/fujitsu-tablet.c,
drivers/platform/x86/ideapad-laptop.c,
drivers/platform/x86/intel_oaktrail.c and
drivers/platform/x86/toshiba_acpi.c between commit 7264eabec580
("Drivers: platform: x86: remove __dev* attributes") from the
driver-core.current tree and various commits from the drivers-x86 tree.

I fixed it up (using the driver-core.current tree versions) and can carry
the fix as necessary (no action is required).

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2013-01-02 04:21    [W:0.030 / U:0.120 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site