| commit | 2aecd7dd2b269989aca99a4f2717504a89a2565c | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Sat Feb 09 16:41:46 2013 -0800 |
| committer | Olof Johansson <olof@lixom.net> | Sat Feb 09 16:41:46 2013 -0800 |
| tree | 8efea817538ff4aa98d6e47e2840b183421d43dd | |
| parent | 94c16ea6ea75f8f5de92d10a647155ccf0d05436 [diff] | |
| parent | b65adbec2d92769242e0ffe742630d88e68f7f22 [diff] |
Merge tag 'at91-cleanup' of git://github.com/at91linux/linux-at91 into next/cleanup From Nicolas Ferre: Little AT91 cleanup: only remove one deprecated board. * tag 'at91-cleanup' of git://github.com/at91linux/linux-at91: ARM: at91: remove NEOCORE 926 board Signed-off-by: Olof Johansson <olof@lixom.net> Modify/remove conflict in arch/arm/mach-at91/board-neocore926.c