From: Arnd Bergmann Date: Tue, 19 Feb 2013 17:21:49 +0000 (+0100) Subject: Merge tag 'boards_for_v3.9_round2' of git://git.infradead.org/users/jcooper/linux... X-Git-Tag: next-20130220~18^2~6^2~1 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8df49ea6bf12d4411ac7b160a704d03c80f77915;p=karo-tx-linux.git Merge tag 'boards_for_v3.9_round2' of git://git.infradead.org/users/jcooper/linux into late/mvebu mvebu boards for v3.9 round2 - defconfig updates to mvebu - SPI, MTD, USB, local_timer, and ATAG->DT - new mvebu board DB-MV784MP-GP Possibly controversial stuff: - mvebu local timer support - I first attempted to get this through the driver maintainer tree: http://www.spinics.net/lists/arm-kernel/msg221317.html on Jan 30th. No response, so I decided to take the whole series through mvebu->arm-soc. - It turns out that this series depends on: 16b30cf arm: mvebu: Improve the SMP support of the interrupt controller which had already been accepted and pushed into mvebu/boards. - So, with the above, I decided the easiest way to merge this series in while avoiding circular dependencies (eg by putting in it's proper place, mvebu/drivers) was to merge them in to mvebu/boards. The only alternative to this I can think of is to hold off till v3.10, but this seemed a little drastic for such a small series. ** From previous tag boards_for_v3.9, no new depends ** depends on: - tags/mvebu_fixes_for_v3.8-rc6 - tags/cleanup_for_v3.9_round2 - tags/drivers_for_v3.9 - mmc/mmc-next up to: d293875 mmc: mvsdio: add pinctrl integration conflicts: - arm-soc/for-next - arch/arm/mach-dove/common.c * remove all DT code (it's now in .../board-dt.c) build fixes (not merge conflict) - arm-soc/for-next - arch/arm/mach-dove/board-dt.c - .timer no longer used * s/.timer = &dove_timer/.init_time = dove_timer_init/ (not valid sed) * tag 'boards_for_v3.9_round2' of git://git.infradead.org/users/jcooper/linux: arm: mvebu: update defconfig with ATAG support when using DT ARM: mvebu: Update defconfig to select SPI flash and MTD support ARM: mvebu: Update defconfig to select SPI support arm: mvebu: support for the new Armada XP development board(DB-MV784MP-GP) arm: mvebu: update defconfig with local timer support clocksource: time-armada-370-xp: add local timer support arm: mvebu: Add support for local interrupt arm: mvebu: Update defconfig to select USB support Signed-off-by: Arnd Bergmann --- 8df49ea6bf12d4411ac7b160a704d03c80f77915