From: Olof Johansson Date: Thu, 29 Aug 2013 21:09:04 +0000 (-0700) Subject: Merge tag 'highbank-for-3.12' of git://sources.calxeda.com/kernel/linux into late/all X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3616257f30316cccb0d92eed83d858f5b49e57ac;p=linux-beck.git Merge tag 'highbank-for-3.12' of git://sources.calxeda.com/kernel/linux into late/all From Rob Herring: Updates for Highbank for 3.12: - A couple of fixes to enable LPAE. - pl08x driver fixes to make it build with ARCH_DMA_ADDR_T_64BIT. - Avoid L2 related smc calls on Midway. - Add selecting of necesssary ARM errata. * tag 'highbank-for-3.12' of git://sources.calxeda.com/kernel/linux: ARM: highbank: clean-up some unused includes ARM: highbank: avoid L2 cache smc calls when PL310 is not present ARM: move outer_cache declaration out of ifdef ARM: highbank: select ARCH_DMA_ADDR_T_64BIT for LPAE DMA: fix printk warning in AMBA PL08x DMA driver DMA: fix AMBA PL08x compilation issue with 64bit DMA address type ARM: highbank: select required errata work-arounds ARM: highbank: select ARCH_HAS_HOLES_MEMORYMODEL ARM: highbank: enable DMA zone for LPAE ARM: use phys_addr_t for DMA zone sizes Signed-off-by: Olof Johansson --- 3616257f30316cccb0d92eed83d858f5b49e57ac