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)
commit42efaeacb71aaf538a80aa22056522d81e63d7fd
tree7f061a9a51472d942b2dcc616af7e1b954e86b9f
parentd0d4907e3550caf434e2ffa862676c98d9975b7f
parentfc40eed01c76797b6f71c982a782cef2d6ab48a6
Merge remote-tracking branch 'lsk/v3.10/topic/libfdt' into lsk-v3.10-arm64-misc

Conflicts:
drivers/of/fdt.c