Messages in this thread | | | Date | Wed, 12 Oct 2011 16:28:05 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the staging tree with the pm tree |
| |
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in drivers/Kconfig between commit a3c98b8b2ede ("PM: Introduce devfreq: generic DVFS framework with device-specific OPPs") from the pm tree and commit 46a971913611 ("Staging: hv: move hyperv code out of staging directory") from the staging tree.
Just context changes. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/Kconfig index a1efd75,ce3c35f..0000000 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@@ -130,6 -130,6 +130,8 @@@ source "drivers/iommu/Kconfig source "drivers/virt/Kconfig" + source "drivers/hv/Kconfig" + +source "drivers/devfreq/Kconfig" + endmenu [unhandled content-type:application/pgp-signature] | |