diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-05-23 20:13:15 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-05-23 20:13:15 +0400 |
| commit | 756abc8d6de06f0afc2121f69030f0d3f4f8177a (patch) | |
| tree | 1c31c952bd02846fcc7d2f43062f036b0eea787c /arch/arm/mach-cns3xxx | |
| parent | 85aea469ef65091ddcfadb848af1ef7ef1d9cedd (diff) | |
| parent | 13984e9bb15528f70059bbbbda3f9028157eebf6 (diff) | |
| download | linux-756abc8d6de06f0afc2121f69030f0d3f4f8177a.tar.xz | |
Merge tag 'at91-fixes2' of git://github.com/at91linux/linux-at91 into fixes
Second 3.15 fixes for AT91
- two fixes concerning iio ADC triggers for at91sam9260 and at91sam9g20
one for the "device" file, the other for the DT.
* tag 'at91-fixes2' of git://github.com/at91linux/linux-at91:
ARM: at91: sam9260: fix compilation issues
ARM: at91/dt: sam9260: correct external trigger value
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-cns3xxx')
0 files changed, 0 insertions, 0 deletions