[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20111012162805.1056a7f7fe3f1140d767a601@canb.auug.org.au>
Date: Wed, 12 Oct 2011 16:28:05 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Greg KH <greg@...ah.com>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
MyungJoo Ham <myungjoo.ham@...sung.com>,
Kyungmin Park <kyungmin.park@...sung.com>,
"Rafael J. Wysocki" <rjw@...k.pl>,
"K. Y. Srinivasan" <kys@...rosoft.com>
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@...b.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
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists