From: Olof Johansson Date: Sat, 4 Jan 2014 05:47:09 +0000 (-0800) Subject: Merge branch 'fixes' into for-next X-Git-Tag: next-20140106~110^2~2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=061984942989ce4b00d08ed8933e9a8200d88721;p=karo-tx-linux.git 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 --- 061984942989ce4b00d08ed8933e9a8200d88721