Merge ../linux-2.6
authorPaul Mackerras <paulus@samba.org>
Wed, 29 Mar 2006 02:24:50 +0000 (13:24 +1100)
committerPaul Mackerras <paulus@samba.org>
Wed, 29 Mar 2006 02:24:50 +0000 (13:24 +1100)
18 files changed:
1  2 
arch/powerpc/kernel/setup_64.c
arch/powerpc/kernel/traps.c
arch/powerpc/mm/mem.c
arch/powerpc/platforms/cell/spufs/inode.c
arch/powerpc/platforms/pseries/reconfig.c
arch/ppc/kernel/ppc_htab.c
arch/ppc/platforms/prep_setup.c
drivers/char/Kconfig
drivers/macintosh/adb.c
drivers/macintosh/adbhid.c
drivers/net/tulip/de4x5.c
drivers/video/aty/aty128fb.c
drivers/video/aty/atyfb_base.c
drivers/video/nvidia/nvidia.c
drivers/video/radeonfb.c
drivers/video/riva/fbdev.c
include/linux/pci_ids.h
sound/oss/dmasound/dmasound_awacs.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge