Merge remote-tracking branch 'clk/clk-next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Thu, 9 Apr 2015 08:26:04 +0000 (18:26 +1000)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Thu, 9 Apr 2015 08:26:04 +0000 (18:26 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Apr 2015 08:26:04 +0000 (18:26 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Apr 2015 08:26:04 +0000 (18:26 +1000)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/clk/clk.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 9 Apr 2015 08:26:04 +0000 (18:26 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 9 Apr 2015 08:26:04 +0000 (18:26 +1000)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/clk/clk.c	patch \|	diff1 \|	diff2 \|	blob \| history