diff options
| author | Olof Johansson <olof@lixom.net> | 2013-02-10 01:41:46 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-02-10 01:41:46 +0100 |
| commit | 2aecd7dd2b269989aca99a4f2717504a89a2565c (patch) | |
| tree | 8efea817538ff4aa98d6e47e2840b183421d43dd /drivers/irqchip/exynos-combiner.c | |
| parent | Merge tag 'v3.8-rc6' into next/cleanup (diff) | |
| parent | ARM: at91: remove NEOCORE 926 board (diff) | |
| download | linux-2aecd7dd2b269989aca99a4f2717504a89a2565c.tar.xz linux-2aecd7dd2b269989aca99a4f2717504a89a2565c.zip | |
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
Diffstat (limited to 'drivers/irqchip/exynos-combiner.c')
0 files changed, 0 insertions, 0 deletions