Merge remote-tracking branch 'lsk/v3.10/topic/of' into linux-linaro-lsk
authorMark Brown <broonie@kernel.org>
Mon, 16 Feb 2015 03:51:52 +0000 (12:51 +0900)
committerMark Brown <broonie@kernel.org>
Mon, 16 Feb 2015 03:51:52 +0000 (12:51 +0900)
commit13beb8851e931b3cfb3403c3a62bfee9ab27a60c
tree6993a8ef1558050d4d41e22fd656ec3e4f61f99a
parentceafc84623c8ef94c13a87363277a595988b2b79
parenta317907a68af5f1509b1b38e3bf378a5178f1c3a
Merge remote-tracking branch 'lsk/v3.10/topic/of' into linux-linaro-lsk

Conflicts:
drivers/of/base.c
drivers/of/fdt.c
drivers/of/address.c
drivers/of/base.c
drivers/of/fdt.c
include/linux/of.h