Merge ../linux-2.6
authorPaul Mackerras <paulus@samba.org>
Fri, 5 May 2006 05:45:48 +0000 (15:45 +1000)
committerPaul Mackerras <paulus@samba.org>
Fri, 5 May 2006 05:45:48 +0000 (15:45 +1000)
commitf18fc729cd2d67b76e24206ee3567c1f6983c358
tree9dbf177222d94213d9dd82d67de6d905e1a2b278
parent5a43ee65620d628ba04deecf241b63b2410b97f2
parentd98550e334715b2d9e45f8f0f4e1608720108640
Merge ../linux-2.6
arch/powerpc/mm/numa.c
arch/powerpc/platforms/pseries/eeh_event.c