Merge branch 'linux-2.6'
commitc2a7dcad9f0d92d7a96e735abb8bec7b9c621536
authorPaul Mackerras <paulus@samba.org>
Fri, 21 Dec 2007 11:21:08 +0000 (21 22:21 +1100)
committerPaul Mackerras <paulus@samba.org>
Fri, 21 Dec 2007 11:21:08 +0000 (21 22:21 +1100)
treebf9b20fdd5ab07e5b0e4e0b95c6a3dbab1005cb9
parent373a6da165ac3012a74fd072da340eabca55d031
parentea67db4cdbbf7f4e74150e71da0984e25121f500
Merge branch 'linux-2.6'
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