linux-next: kvm/powerpc merge conflict

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the powerpc got a conflict in
include/asm-powerpc/mmu-44x.h between commit
dbc0b98a9feb95a65275d9937d815a3bd4300103 ("ppc: Export tlb_44x_hwater for
KVM") in the kvm tree and commit d04ceb3fc294ea2c4f538a04343f3a473953a3b0
("[POWERPC] Move phys_addr_t definition into asm/types.h") in the powerpc
tree.  The fixup was trivial.

-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <http://lists.ozlabs.org/pipermail/linuxppc-dev/attachments/20080421/6fc5faeb/attachment.pgp>