Merge branch 'lsk/v3.10/topic/of' into linux-linaro-lsk

author Mark Brown <broonie@kernel.org>

Sat, 21 Feb 2015 03:16:39 +0000 (12:16 +0900)

committer Mark Brown <broonie@kernel.org>

Sat, 21 Feb 2015 09:06:44 +0000 (18:06 +0900)
author Mark Brown <broonie@kernel.org>
Sat, 21 Feb 2015 03:16:39 +0000 (12:16 +0900)
committer Mark Brown <broonie@kernel.org>
Sat, 21 Feb 2015 09:06:44 +0000 (18:06 +0900)
diff --cc drivers/of/Kconfig
Simple merge
diff --cc drivers/of/Makefile
Simple merge
author	Mark Brown <broonie@kernel.org>
	Sat, 21 Feb 2015 03:16:39 +0000 (12:16 +0900)
committer	Mark Brown <broonie@kernel.org>
	Sat, 21 Feb 2015 09:06:44 +0000 (18:06 +0900)
		1	2
drivers/of/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/of/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history