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)
commitbac30d1a78d0f11c613968fc8b351a91ed465386
treee52f3c876522a2f6047a6ec1c27df2e8a79486b8
parente8222502ee6157e2713da9e0792c21f4ad458d50
parentca9ba4471c1203bb6e759b76e83167fec54fe590
Merge ../linux-2.6
18 files changed:
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