Merge branch 'devicetree/merge' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 9 Nov 2014 22:33:49 +0000 (14:33 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 9 Nov 2014 22:33:49 +0000 (14:33 -0800)
Pull devicetree bugfix from Grant Likely:
 "One buffer overflow bug that shouldn't be left around"

* 'devicetree/merge' of git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux:
  of: Fix overflow bug in string property parsing functions


Trivial merge