Merge branch 'devicetree/merge' of git://git.kernel.org/pub/scm/linux/kernel/git...
commita3157809772c4a5256ef68a4d5b21ea4ecc80ad4
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 9 Nov 2014 22:33:49 +0000 (9 14:33 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 9 Nov 2014 22:33:49 +0000 (9 14:33 -0800)
tree1269b7442c98571c9a4bce5f02e2c7cc6e6d1d40
parentc4c23fb6f2b17c922b493f79cf27a0d32397f461
parenta87fa1d81a9fb5e9adca9820e16008c40ad09f33
Merge branch 'devicetree/merge' of git://git./linux/kernel/git/glikely/linux

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