]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit74d6396682dff47614738f2ef936b964a00c5577
tree408354b3cd06a83fcd855289e38ee7dc562e4148
parentcd99d4606f7724615c5125209ae49b752c29141d
parent3c1dc2d8dad9d0bced9ade496508692ec54b4d09
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