]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
Merge tag 'at91-5.4-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux...
authorArnd Bergmann <arnd@arndb.de>
Tue, 3 Sep 2019 12:23:43 +0000 (14:23 +0200)
committerArnd Bergmann <arnd@arndb.de>
Tue, 3 Sep 2019 12:23:44 +0000 (14:23 +0200)
AT91 SoC for 5.4

 - MAINTAINERS updates
 - a generated headers parallel build fix

* tag 'at91-5.4-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
  mailmap: map old company name to new one @microchip.com
  MAINTAINERS: at91: remove the TC entry
  MAINTAINERS: at91: Collect all pinctrl/gpio drivers in same entry
  ARM: at91: move platform-specific asm-offset.h to arch/arm/mach-at91

Link: https://lore.kernel.org/r/20190825203222.GA22800@piout.net
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
1  2 
.mailmap
MAINTAINERS

diff --cc .mailmap
Simple merge
diff --cc MAINTAINERS
Simple merge