Merge branch 'linux-2.6'

diff --cc arch/powerpc/platforms/iseries/lpevents.c
Simple merge

diff --cc arch/powerpc/sysdev/cpm2_common.c
Simple merge

diff --cc drivers/net/fs_enet/mac-scc.c
Simple merge

diff --cc drivers/net/ucc_geth.c
Simple merge

diff --cc include/asm-powerpc/commproc.h
Simple merge