Merge remote-tracking branch 'lsk/v3.10/topic/dma-mapping' into lsk-v3.10-arm64-misc
authorMark Brown <broonie@kernel.org>
Fri, 23 Jan 2015 20:27:25 +0000 (20:27 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 23 Jan 2015 20:27:25 +0000 (20:27 +0000)
commit4b647eeef8ef684754b58b46eb5bc7d9b55e7279
tree558cc07a87f9e76bf0c7884975bc6376ab596eac
parentb749ecc6dac6514265c4a07f3d283c214377fcc5
parentdd403c2d2cf5c25eb82310bfe70704c0ea8452b7
Merge remote-tracking branch 'lsk/v3.10/topic/dma-mapping' into lsk-v3.10-arm64-misc
arch/arm/mm/dma-mapping.c