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)
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>
1  2 
arch/arm/mach-at91/at91sam9260_devices.c