git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7015faa ee807c2)
Merge by Hand
authorJames Bottomley <jejb@titanic.(none)>
Sat, 5 Nov 2005 04:29:52 +0000 (22:29 -0600)
committerJames Bottomley <jejb@titanic.(none)>
Sat, 5 Nov 2005 04:29:52 +0000 (22:29 -0600)
Conflicts in dec_esp.c (Thanks Bacchus), scsi_transport_iscsi.c and
scsi_transport_fc.h

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

Trivial merge
Pandora Kernel Repository