git.agner.ch Git - linux-drm-fsl-dcu.git/commit

projects / linux-drm-fsl-dcu.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: e822250 ca9ba44)

author	Paul Mackerras <paulus@samba.org>
	Wed, 29 Mar 2006 02:24:50 +0000 (13:24 +1100)
committer	Paul Mackerras <paulus@samba.org>
	Wed, 29 Mar 2006 02:24:50 +0000 (13:24 +1100)
commit	bac30d1a78d0f11c613968fc8b351a91ed465386
tree	e52f3c876522a2f6047a6ec1c27df2e8a79486b8	tree \| snapshot
parent	e8222502ee6157e2713da9e0792c21f4ad458d50	commit \| diff
parent	ca9ba4471c1203bb6e759b76e83167fec54fe590	commit \| diff

Merge ../linux-2.6

18 files changed:

arch/powerpc/kernel/setup_64.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/traps.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/mm/mem.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/cell/spufs/inode.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/pseries/reconfig.c	diff1 \|	diff2 \|	blob \| history
arch/ppc/kernel/ppc_htab.c	diff1 \|	diff2 \|	blob \| history
arch/ppc/platforms/prep_setup.c	diff1 \|	diff2 \|	blob \| history
drivers/char/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/macintosh/adb.c	diff1 \|	diff2 \|	blob \| history
drivers/macintosh/adbhid.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tulip/de4x5.c	diff1 \|	diff2 \|	blob \| history
drivers/video/aty/aty128fb.c	diff1 \|	diff2 \|	blob \| history
drivers/video/aty/atyfb_base.c	diff1 \|	diff2 \|	blob \| history
drivers/video/nvidia/nvidia.c	diff1 \|	diff2 \|	blob \| history
drivers/video/radeonfb.c	diff1 \|	diff2 \|	blob \| history
drivers/video/riva/fbdev.c	diff1 \|	diff2 \|	blob \| history
include/linux/pci_ids.h	diff1 \|	diff2 \|	blob \| history
sound/oss/dmasound/dmasound_awacs.c	diff1 \|	diff2 \|	blob \| history

Freescale DCU DRM driver