From: Arnd Bergmann Date: Tue, 10 May 2016 09:27:45 +0000 (+0200) Subject: Merge tag 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux... X-Git-Tag: v4.6~8^2~2 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=e061b5695ad52c987d4ee9033a6d09163da6607a;p=linux-2.6-block.git Merge tag 'at91-fixes' of git://git./linux/kernel/git/nferre/linux-at91 into fixes Merge "at91: fixes for 4.6 #1" from Nicolas Ferre: Here is a late fix for AT91. Sorry to have figure it out so late in the development cycle but we had to confirm it was an error with the documentation of two products. So, as the compatibility string is in since 4.6-rc1 and that the previous one works okay, it's a good opportunity to switch back to the one that works without introducing a intermediary bug. The revert on driver code and the removal of the useless additional compatibility string will be queued for 4.7 through NAND/MTD. * tag 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91: ARM: dts: at91: sama5d2: use "atmel,sama5d3-nfc" compatible for nfc --- e061b5695ad52c987d4ee9033a6d09163da6607a