From: Olof Johansson 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: v4.2-rc3~4^2~5 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a549608f5c8423eb25115785ad465c5a57cbe0de;p=karo-tx-linux.git Merge tag 'socfpga_fixes_for_v4.2-rc1' of git://git.kernel.org/pub/scm/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