From: Olof Johansson Date: Tue, 21 May 2013 06:24:49 +0000 (-0700) Subject: Merge tag 'fixes-3.10-1' of git://git.infradead.org/users/jcooper/linux into fixes X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4ae608e137a8b0e5a34a4f4c409f8468b4685df9;p=openwrt%2Fstaging%2Fblogic.git Merge tag 'fixes-3.10-1' of git://git.infradead.org/users/jcooper/linux into fixes From Jason Cooper, mvebu fixes for v3.10: - mvebu - duplicate alias removal - augment new internal-regs dt node with proper ranges node - kirkwood - stable fix for QNAP TS-11x/TS-21x enabling PCIe port 1 - plat-orion - missing ehci include in common.h. needed within common.h. * tag 'fixes-3.10-1' of git://git.infradead.org/users/jcooper/linux: ARM: mvebu: Add a ranges entry to translate devbus childs ARM: plat-orion: add missing ehci include to common.h Kirkwood: Enable PCIe port 1 on QNAP TS-11x/TS-21x ARM: mvebu: do not duplicate the mpic alias Signed-off-by: Olof Johansson --- 4ae608e137a8b0e5a34a4f4c409f8468b4685df9