Merge remote-tracking branch 'lsk/v3.10/topic/of' into linux-linaro-lsk
authorMark Brown <broonie@kernel.org>
Thu, 19 Feb 2015 10:17:10 +0000 (19:17 +0900)
committerMark Brown <broonie@kernel.org>
Thu, 19 Feb 2015 10:17:10 +0000 (19:17 +0900)
commitf6e46ae658e4443e765f87702603deca167f2b57
tree8b1a6e628defdcc10e788bd3d903e8c14e314aed
parent7710601a8b24a3f77ebdfc7b213c21344c650987
parent82b67d73b121febe5ae76747680a2d979c21c5e6
Merge remote-tracking branch 'lsk/v3.10/topic/of' into linux-linaro-lsk

Conflicts:
drivers/of/Makefile
drivers/of/Kconfig
drivers/of/Makefile
drivers/of/selftest.c
include/linux/of.h