Merge tag 'socfpga_fixes_for_v4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel...
authorOlof Johansson <olof@lixom.net>
Tue, 14 Jul 2015 09:16:55 +0000 (11:16 +0200)
committerOlof Johansson <olof@lixom.net>
Tue, 14 Jul 2015 09:16:55 +0000 (11:16 +0200)
commita549608f5c8423eb25115785ad465c5a57cbe0de
tree408354b3cd06a83fcd855289e38ee7dc562e4148
parent1d8aca9df612f5751892fb2642d72536f2f48fd0
parent93abc72bc7901cfc61a2871da7a565c9fdb26108
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