Merge remote-tracking branch 'lsk/v3.10/topic/libfdt' into lsk-v3.10-arm64-misc
authorMark Brown <broonie@kernel.org>
Sat, 13 Sep 2014 17:23:07 +0000 (10:23 -0700)
committerMark Brown <broonie@kernel.org>
Sat, 13 Sep 2014 17:23:07 +0000 (10:23 -0700)
Conflicts:
drivers/of/fdt.c


Trivial merge