Merge conflicts in ppc64/mm/{hash_native.c,tlb.c}

[Jon Loeliger]

So, like, the other day Paul Mackerras mumbled:
> 
> Ben's hugepage fixes clashed with Ben's virtual-addr-in-batch patch.
> I have done the merge and resolved the conflict and pushed it out.  It
> should be on kernel.org soon.

Excellent!  Thanks.

jdl