]> err.no Git - linux-2.6/commitdiff
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)
1  2 
arch/powerpc/mm/numa.c
arch/powerpc/platforms/pseries/eeh_event.c

Simple merge