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

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

Tue, 7 Jan 2014 05:37:44 +0000 (16:37 +1100)

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

Tue, 7 Jan 2014 05:37:44 +0000 (16:37 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 7 Jan 2014 05:37:44 +0000 (16:37 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 7 Jan 2014 05:37:44 +0000 (16:37 +1100)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/clk/Makefile
Simple merge
diff --cc drivers/clk/tegra/clk-periph.c
Simple merge
diff --cc include/linux/clk-provider.h
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 7 Jan 2014 05:37:44 +0000 (16:37 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 7 Jan 2014 05:37:44 +0000 (16:37 +1100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/clk/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/clk/tegra/clk-periph.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/clk-provider.h	patch \|	diff1 \|	diff2 \|	blob \| history