linux-next: manual merge of the akpm tree with the arm-soc tree

From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Mike Turquette <mturquette@linaro.org>,
	Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
	linux-arm-kernel@lists.infradead.org,
	Viresh Kumar <viresh.kumar@st.com>
Subject: linux-next: manual merge of the akpm tree with the arm-soc tree
Date: Mon, 14 May 2012 19:24:04 +1000	[thread overview]
Message-ID: <20120514192404.91f9477851ad8485a2112973@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1214 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
drivers/clk/Kconfig between commit d269b974e32c ("clk: remove
COMMON_CLK_DISABLE_UNUSED") from the arm-soc tree and commit "clk: remove
redundant depends on from drivers/Kconfig" from the akpm tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/clk/Kconfig
index 4864407,4f10a21..0000000

--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@@ -23,9 -22,18 +23,8 @@@ config COMMON_CL
  menu "Common Clock Framework"
  	depends on COMMON_CLK
  
 -config COMMON_CLK_DISABLE_UNUSED
 -	bool "Disabled unused clocks at boot"
 -	---help---
 -	  Traverses the entire clock tree and disables any clocks that are
 -	  enabled in hardware but have not been enabled by any device drivers.
 -	  This saves power and keeps the software model of the clock in line
 -	  with reality.
 -
 -	  If in doubt, say "N".
 -
  config COMMON_CLK_DEBUG
  	bool "DebugFS representation of clock tree"
- 	depends on COMMON_CLK
  	select DEBUG_FS
  	---help---
  	  Creates a directory hierchy in debugfs for visualizing the clk

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
