linux-next: manual merge of the arm-lpae tree with the arm tree
From: Stephen Rothwell
Date: Thu Jun 16 2011 - 20:26:54 EST
Today's linux-next merge of the arm-lpae tree got a conflict in
arch/arm/mm/dma-mapping.c between commit 8f5d638883e0 ("ARM: DMA: steal
memory for DMA coherent mappings") from the arm tree and commit
7b550c77c248 ("ARM: LPAE: Use PMD_(SHIFT|SIZE|MASK) instead of PGDIR_*")
from the arm-lpae tree.
The former has removed all the references to the PGDIR_* macros from this
file, so I used that.
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Description: PGP signature