Merge branch 'devicetree/merge' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 4 Nov 2014 20:54:55 +0000 (21:54 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 4 Nov 2014 20:54:55 +0000 (21:54 +0100)
commita5501fe4eaa4ee35f8de6efac8d1c4ad16094951
treea6938084b9639c2aa54b3f7cc5fd0bebbbf3097d
parent0df1f2487d2f0d04703f142813d53615d62a1da4
parenta87fa1d81a9fb5e9adca9820e16008c40ad09f33
Merge branch 'devicetree/merge' of git://git./linux/kernel/git/glikely/linux

Pull Device Tree bug fix from Grant Likely.

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