Merge tag 'at91-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux...
authorArnd Bergmann <arnd@arndb.de>
Tue, 6 Oct 2015 14:43:25 +0000 (16:43 +0200)
committerArnd Bergmann <arnd@arndb.de>
Tue, 6 Oct 2015 14:43:25 +0000 (16:43 +0200)
Merge "First little batch of SoC changes for 4.4" from Nicolas Ferre:

- a MAINTAINER addition to cover SAMA5 SoCs
- removal of one unneeded header file
- for low-level serial output, use the DEBUG_UART_PHYS

* tag 'at91-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
  ARM: at91: debug: use DEBUG_UART_PHYS
  ARM: at91: remove useless includes in platform_data/atmel.h
  MAINTAINERS: explicitly add Atmel SAMA5

1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge