Merge branch 'clk-lpc32xx' into clk-next

author Michael Turquette <mturquette@baylibre.com>

Thu, 24 Dec 2015 20:34:29 +0000 (12:34 -0800)

committer Michael Turquette <mturquette@baylibre.com>

Thu, 24 Dec 2015 20:34:29 +0000 (12:34 -0800)
author Michael Turquette <mturquette@baylibre.com>
Thu, 24 Dec 2015 20:34:29 +0000 (12:34 -0800)
committer Michael Turquette <mturquette@baylibre.com>
Thu, 24 Dec 2015 20:34:29 +0000 (12:34 -0800)
diff --cc drivers/clk/Kconfig
Simple merge
diff --cc drivers/clk/Makefile
Simple merge
author	Michael Turquette <mturquette@baylibre.com>
	Thu, 24 Dec 2015 20:34:29 +0000 (12:34 -0800)
committer	Michael Turquette <mturquette@baylibre.com>
	Thu, 24 Dec 2015 20:34:29 +0000 (12:34 -0800)
		1	2
drivers/clk/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/clk/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history