Merge by hand from Linus' tree.
authorPaul Mackerras <paulus@samba.org>
Thu, 29 Sep 2005 03:13:36 +0000 (13:13 +1000)
committerPaul Mackerras <paulus@samba.org>
Thu, 29 Sep 2005 03:13:36 +0000 (13:13 +1000)
commitab11d1ea281e85895369ef57c5259ad8a432fabb
tree684147479c6a8bb2fbed21bdcf12de1dd519c730
parent952ecef7a0479049c8abb7c34a688ec2981ceadd
parent664cceb0093b755739e56572b836a99104ee8a75
Merge by hand from Linus' tree.

Signed-off-by: Paul Mackerras <paulus@samba.org>
arch/ppc/kernel/perfmon.c
arch/ppc64/mm/hash_native.c
arch/ppc64/mm/tlb.c
include/asm-ppc64/tlbflush.h