From: Olof Johansson <olof@lixom.net>
Date: Tue, 14 Jul 2015 09:16:55 +0000 (+0200)
Subject: Merge tag 'socfpga_fixes_for_v4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: omap-for-v4.3/fixes-merge-window~218^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a549608f5c8423eb25115785ad465c5a57cbe0de;p=pandora-kernel.git

Merge tag 'socfpga_fixes_for_v4.2-rc1' of git://git./linux/kernel/git/dinguyen/linux into fixes

Merge "SoCFPGA fixes for v4.2-rc1" from Dinh Nguyen:

SoCFPGA fixes against v4.2-rc1
- Update compatible "adxl345x" compatible string
- Alphabetize the DTS nodes for the C5 sockit board file

* tag 'socfpga_fixes_for_v4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
  ARM: socfpga: dts: Fix entries order
  ARM: socfpga: dts: Fix adxl34x formating and compatible string
---

a549608f5c8423eb25115785ad465c5a57cbe0de