Re: linux-next: manual merge of the wireless tree with the acpitree

[Matthew Garrett]

On Wed, Jun 03, 2009 at 12:20:46PM +1000, Stephen Rothwell wrote:
> Hi John,
> 
> Today's linux-next merge of the wireless tree got a conflict in
> drivers/platform/x86/Kconfig between commit
> eedd8dca3c0e6c1fcb5cba11321ea9d69917d85b ("eeepc-laptop: Register as a
> pci-hotplug device") from the acpi tree and commit
> c6d660ce29295d344fcdc3654274b4a0aad1a9c8 ("rfkill: rewrite") from the
> wireless tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

Patch looks fine.

-- 
Matthew Garrett | mjg59@xxxxxxxxxxxxx
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/