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

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

summary | shortlog | log | commit | commitdiff | tree
(merge: 3173d8c fe1b2d5)

author	James Bottomley <jejb@titanic.(none)>
	Tue, 6 Sep 2005 22:52:54 +0000 (17:52 -0500)
committer	James Bottomley <jejb@titanic.(none)>
	Tue, 6 Sep 2005 22:52:54 +0000 (17:52 -0500)
commit	17fa53da1239b8712c5cebbd72a74c713b6c2db9
tree	8cf55e47ce681a6c899ccf8e06abeccecb20d38b	tree \| snapshot
parent	3173d8c342971a03857d8af749a3f57da7d06b57	commit \| diff
parent	fe1b2d544d71300f8e2d151c3c77a130d13a58be	commit \| diff

Merge by hand (conflicts in sd.c)

drivers/scsi/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/scsi/aic7xxx/aic7xxx_osm.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/scsi_error.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/scsi_ioctl.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/sd.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/sg.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/st.c	diff1 \|	diff2 \|	blob \| history
include/scsi/scsi_eh.h	diff1 \|	diff2 \|	blob \| history

Freescale DCU DRM driver