From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 23 May 2014 16:13:15 +0000 (+0200)
Subject: Merge tag 'at91-fixes2' of git://github.com/at91linux/linux-at91 into fixes
X-Git-Tag: v3.15-rc8~22^2~3
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=756abc8d6de06f0afc2121f69030f0d3f4f8177a;p=linux.git

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>
---

756abc8d6de06f0afc2121f69030f0d3f4f8177a