linux-next: manual merge of the drivers-x86 tree with thedriver-core.current tree

From: Stephen Rothwell
Date: Tue Jan 01 2013 - 21:39:54 EST

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/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).

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature