]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 85aea46 13984e9)
Merge tag 'at91-fixes2' of git://github.com/at91linux/linux-at91 into fixes
authorArnd Bergmann <arnd@arndb.de>
Fri, 23 May 2014 16:13:15 +0000 (18:13 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 23 May 2014 16:13:15 +0000 (18:13 +0200)
commit756abc8d6de06f0afc2121f69030f0d3f4f8177a
tree1c31c952bd02846fcc7d2f43062f036b0eea787ctree | snapshot
parent85aea469ef65091ddcfadb848af1ef7ef1d9ceddcommit | diff
parent13984e9bb15528f70059bbbbda3f9028157eebf6commit | diff
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>
arch/arm/mach-at91/at91sam9260_devices.c diff1 | diff2 | blob | history
Linux kernel for KaRo TX COM modules