]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge tag 'at91-cleanup3' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre...
authorArnd Bergmann <arnd@arndb.de>
Fri, 28 Nov 2014 15:15:14 +0000 (16:15 +0100)
committerArnd Bergmann <arnd@arndb.de>
Fri, 28 Nov 2014 15:15:14 +0000 (16:15 +0100)
commite155aee2b279b099da5c5cfd6df5795e7388ece1
tree36c4469f2e86ea0e2f12ffa54ee78bfb56ba3d06
parent81cc3f868d30884c6f2d2bf5d1861fbeb24ddebd
parent4fdfb67f24b64844ac110622bb51b2ee0f894492
Merge tag 'at91-cleanup3' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/cleanup

Pull "Third batch of cleanup/SoC for 3.19" from Nicolas Ferre:

- fixes following legacy board removal
- removal of legacy board support for at91sam9263, at91sam9260/at91sam9g20
  and at91sam9261/at91sam9g10 SoCs families. Please use DT now.
- removal of some now useless Kconfig options

* tag 'at91-cleanup3' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
  ARM: at91/Kconfig: remove useless fbdev Kconfig options
  ARM: at91: remove at91sam9261/at91sam9g10 legacy board support
  ARM: at91/Kconfig: remove unused config options
  ARM: at91: remove at91sam9260/at91sam9g20 legacy board support
  ARM: at91: remove at91sam9260/at91sam9g20 legacy boards files
  ARM: at91: remove at91sam9263 legacy board support
  ARM: at91/at91sam9g45: remove useless header file

Conflicts:
arch/arm/mach-at91/at91sam9g45.c

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
arch/arm/mach-at91/at91sam9g45.c
drivers/rtc/Kconfig