]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'fixes' into for-next
authorOlof Johansson <olof@lixom.net>
Sat, 4 Jan 2014 05:47:09 +0000 (21:47 -0800)
committerOlof Johansson <olof@lixom.net>
Sat, 4 Jan 2014 05:47:09 +0000 (21:47 -0800)
commit061984942989ce4b00d08ed8933e9a8200d88721
tree49eb385194c5c6a493a3b32e9d3517ee4f3a4c7d
parent7191e02b4b7ca31b454ae2ef3ae7be3b88bc5553
parent8f568b496dd95f2a5ad895d508c984f5bb09b220
Merge branch 'fixes' into for-next

* fixes:
  ARM: imx: Explicitly pass the active level of the PHY reset
  ARM: shmobile: mackerel: Fix coherent DMA mask
  ARM: shmobile: kzm9g: Fix coherent DMA mask
  ARM: shmobile: armadillo: Fix coherent DMA mask
arch/arm/mach-shmobile/board-armadillo800eva.c
arch/arm/mach-shmobile/board-mackerel.c