From: Linus Torvalds Date: Mon, 9 Apr 2018 16:26:36 +0000 (-0700) Subject: Merge branch 'for-linus-sa1100' of git://git.armlinux.org.uk/~rmk/linux-arm X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=7886e8aa7ff59198271ac650878eb247627a8b9a;p=linux.git Merge branch 'for-linus-sa1100' of git://git.armlinux.org.uk/~rmk/linux-arm Pull ARM SA1100 updates from Russell King: "We have support for arbitary MMIO registers providing platform GPIOs, which allows us to abstract some of the SA11x0 CF support. This set of updates makes that change" * 'for-linus-sa1100' of git://git.armlinux.org.uk/~rmk/linux-arm: ARM: sa1100/simpad: switch simpad CF to use gpiod APIs ARM: sa1100/shannon: convert to generic CF sockets ARM: sa1100/nanoengine: convert to generic CF sockets ARM: sa1100/h3xxx: switch h3xxx PCMCIA to use gpiod APIs ARM: sa1100/cerf: convert to generic CF sockets ARM: sa1100/assabet: convert to generic CF sockets ARM: sa1100: provide infrastructure to support generic CF sockets pcmcia: sa1100: provide generic CF support --- 7886e8aa7ff59198271ac650878eb247627a8b9a