]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit6bf34e347f18462d9fd926c3d322b0c41d6a52ab
tree684147479c6a8bb2fbed21bdcf12de1dd519c730
parentc55f1f9586a6647347949041833dd3ff65a8fa16
parent07412af856ebda736aeda5e0a173168ebb2879fa
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