Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Thu, 24 Jul 2014 22:01:03 +0000 (23:01 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 24 Jul 2014 22:01:03 +0000 (23:01 +0100)
commitc98536343efee5087773751d2a26899ed302acf3
tree464ae8b698ddbb2268e2d1d1f613d75c9ffb3dba
parentb54021f4075c0efb204da4e9c830197d8069da30
parentbcddae4453f74e9d1dbc8db78c5c9bc552c600cb
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

Conflicts:
drivers/of/fdt.c
drivers/of/fdt.c
include/linux/of_fdt.h