Merge tag 'at91-drivers-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/at91...
authorArnd Bergmann <arnd@arndb.de>
Mon, 30 Nov 2020 16:19:19 +0000 (17:19 +0100)
committerArnd Bergmann <arnd@arndb.de>
Mon, 30 Nov 2020 16:19:20 +0000 (17:19 +0100)
AT91 drivers for 5.11:

 - add sam9x60 SiP IDs
 - at91_cf cleanups

* tag 'at91-drivers-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
  pcmcia: at91_cf: remove platform data support
  pcmcia: at91_cf: move definitions locally
  ARM: at91: sam9x60 SiP types added to soc description

Link: https://lore.kernel.org/r/20201127214140.GA1688544@piout.net
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Trivial merge