From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 30 Mar 2012 10:38:17 +0000 (+0000)
Subject: Merge branch 'at91/dt2+at91-kconfig' into next/cleanup3
X-Git-Tag: next-20120402~6^2~1^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3a702f73496fc7cbc4776b83f8f38a1cdc1f60fa;p=karo-tx-linux.git

Merge branch 'at91/dt2+at91-kconfig' into next/cleanup3

* at91/dt2+at91-kconfig:
  hwrng: Kconfig: remove dependency for atmel-rng driver
  Input: Kconfig: remove dependency for atmel_tsadcc driver
  rtc: Kconfig: remove dependency for AT91 rtc driver
  mmc: atmel-mci: remove the need for CONFIG_MMC_ATMELMCI_DMA
  mmc: Kconfig: remove choice between at91_mci and atmel-mci
  dmaengine: Kconfig: fix Atmel at_hdmac entry
  ARM: at91/Kconfig: website link for AT91SAM9G20-EK
  ARM: at91/Kconfig: add AT91SAM9x5 family to AT91_EARLY_DBGU0 entry
  ARM: at91/Kconfig: add clarifications to AT91SAM9M10G45-EK entry
  ARM: at91/Kconfig: add comment to at91sam9x5 family entry
  ARM: at91/Kconfig: change at91sam9g45 entry
  ARM: at91: change AT91 Kconfig entry comment
---

3a702f73496fc7cbc4776b83f8f38a1cdc1f60fa