diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-11 20:03:24 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-11 20:03:24 +0200 |
commit | 2dc24b0d0636349d403ae803bbad0c84f6c2ea57 (patch) | |
tree | 3f2661ad4bf5f497e0d411bfdb2f5e512f936181 /block/blk-flush.c | |
parent | Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jac... (diff) | |
parent | ARM: keystone: Drop use of meminfo since its not available anymore (diff) | |
download | linux-2dc24b0d0636349d403ae803bbad0c84f6c2ea57.tar.xz linux-2dc24b0d0636349d403ae803bbad0c84f6c2ea57.zip |
Merge tag 'soc2-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull part two of ARM SoC updates from Arnd Bergmann:
"This is a small follow-up to the larger ARM SoC updates merged last
week, almost entirely for the keystone platform.
The main change here is to use the new dma-ranges parsing code that
came in through Russell's ARM tree. This allows the keystone platform
to do cache-coherent DMA and to finally support all the available
physical memory when LPAE is enabled.
Aside from this, the keystone reset driver has been rewritten, and
there is a small bug fix to allow building the orion5x platform again"
* tag 'soc2-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM: keystone: Drop use of meminfo since its not available anymore
ARM: orion5x: fix mvebu_mbus_dt_init call
ARM: configs: keystone: enable reset driver support
ARM: dts: keystone: update reset node to work with reset driver
ARM: keystone: remove redundant reset stuff
ARM: keystone: Update the dma offset for non-dt platform devices
ARM: keystone: Switch over to coherent memory address space
ARM: configs: keystone: add MTD_SPI_NOR (new dependency for M25P80)
ARM: configs: keystone: drop CONFIG_COMMON_CLK_DEBUG
Diffstat (limited to 'block/blk-flush.c')
0 files changed, 0 insertions, 0 deletions