Merge ../linux-2.6

diff --cc arch/powerpc/kernel/setup_64.c
Simple merge

diff --cc arch/powerpc/kernel/traps.c
Simple merge

diff --cc arch/powerpc/mm/mem.c
Simple merge

diff --cc arch/powerpc/platforms/cell/spufs/inode.c
Simple merge

diff --cc arch/powerpc/platforms/pseries/reconfig.c
Simple merge

diff --cc arch/ppc/kernel/ppc_htab.c
Simple merge

diff --cc arch/ppc/platforms/prep_setup.c
Simple merge

diff --cc drivers/char/Kconfig
Simple merge

diff --cc drivers/macintosh/adb.c
Simple merge

diff --cc drivers/macintosh/adbhid.c
Simple merge

diff --cc drivers/net/tulip/de4x5.c
Simple merge

diff --cc drivers/video/aty/aty128fb.c
Simple merge

diff --cc drivers/video/aty/atyfb_base.c
Simple merge

diff --cc drivers/video/nvidia/nvidia.c
Simple merge

diff --cc drivers/video/radeonfb.c
Simple merge

diff --cc drivers/video/riva/fbdev.c
Simple merge

diff --cc include/linux/pci_ids.h
Simple merge

diff --cc sound/oss/dmasound/dmasound_awacs.c
Simple merge