| commit | 51bbd7de49fbedae156e1b9ad3dbdf14969006d3 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Thu Jun 20 15:13:31 2013 +0200 |
| committer | Arnd Bergmann <arnd@arndb.de> | Thu Jun 20 15:13:31 2013 +0200 |
| tree | 9f6207a60484e3dd32e4270870ad06dba7bc5475 | |
| parent | c5dece37c53f5b9e1dee434a994e2d0ff457a267 [diff] | |
| parent | 133e00116b5bc76110bcc41ded369489209b641f [diff] |
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>