Re: linux-next: manual merge of the pm tree with the mmc tree

[Rafael J. Wysocki]

On Monday, March 19, 2012, Stephen Rothwell wrote:
> Hi Rafael,
> 
> Today's linux-next merge of the pm tree got a conflict in
> drivers/mmc/host/tmio_mmc_pio.c between commit 4d741159c282 ("mmc:
> tmio_mmc: support the generic MMC GPIO card hotplug helper") from the mmc
> tree and commit c419e611c3c5 ("tmio_mmc / PM: Use PM QoS latency
> constraint") from the pm tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

Please do, thanks a lot!

Rafael
--
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/