Messages in this thread | | | Date | Wed, 3 Jun 2009 04:03:21 +0100 | From | Matthew Garrett <> | Subject | Re: linux-next: manual merge of the wireless tree with the acpi tree |
| |
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@srcf.ucam.org
| |