diff options
| author | Arnd Bergmann <[email protected]> | 2020-11-30 17:19:19 +0100 |
|---|---|---|
| committer | Arnd Bergmann <[email protected]> | 2020-11-30 17:19:20 +0100 |
| commit | c6241fd5de13f561ad147173f93f70a5f7058690 (patch) | |
| tree | e9366ad6a804863a13f0a84e11c5b0f5727abea8 /arch/um | |
| parent | 270a5bbb090cd235a75739dc76684f8e93f3516b (diff) | |
| parent | 264788c8f23703d0d3e967fb5aea83eb64d2cb2b (diff) | |
Merge tag 'at91-drivers-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/drivers
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/[email protected]
Signed-off-by: Arnd Bergmann <[email protected]>
Diffstat (limited to 'arch/um')
0 files changed, 0 insertions, 0 deletions