]> err.no Git - linux-2.6/commitdiff
Merge branch 'linux-2.6'
authorPaul Mackerras <paulus@samba.org>
Fri, 21 Dec 2007 11:21:08 +0000 (22:21 +1100)
committerPaul Mackerras <paulus@samba.org>
Fri, 21 Dec 2007 11:21:08 +0000 (22:21 +1100)
1  2 
arch/powerpc/platforms/iseries/lpevents.c
arch/powerpc/sysdev/cpm2_common.c
drivers/net/fs_enet/mac-scc.c
drivers/net/ucc_geth.c
include/asm-powerpc/commproc.h

Simple merge
Simple merge
Simple merge
Simple merge