Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into next/fixes-non...
authorArnd Bergmann <arnd@arndb.de>
Thu, 20 Jun 2013 13:13:31 +0000 (15:13 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 20 Jun 2013 13:13:31 +0000 (15:13 +0200)
commit51bbd7de49fbedae156e1b9ad3dbdf14969006d3
tree9f6207a60484e3dd32e4270870ad06dba7bc5475
parentc5dece37c53f5b9e1dee434a994e2d0ff457a267
parent133e00116b5bc76110bcc41ded369489209b641f
Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into next/fixes-non-critical

From Nicolas Ferre:

Two non critical fixes that can go in 3.11.

* tag 'at91-fixes' of git://github.com/at91linux/linux-at91:
  ARM: at91: Change the internal SRAM memory type MT_MEMORY_NONCACHED
  ARM: at91: Fix link breakage when !CONFIG_PHYLIB

Signed-off-by: Arnd Bergmann <arnd@arndb.de>