Merge remote-tracking branch 'lsk/v3.10/topic/arm64-dma' into linux-linaro-lsk
authorMark Brown <broonie@linaro.org>
Wed, 21 May 2014 23:11:40 +0000 (00:11 +0100)
committerMark Brown <broonie@linaro.org>
Wed, 21 May 2014 23:11:40 +0000 (00:11 +0100)
1  2 
arch/arm64/kernel/setup.c

Simple merge