]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2a298a3 4d5cda0)
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 2 Dec 2005 22:32:44 +0000 (14:32 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 2 Dec 2005 22:32:44 +0000 (14:32 -0800)
1  2 
MAINTAINERS patch | diff1 | diff2 | blob | history
drivers/message/fusion/mptbase.c patch | diff1 | diff2 | blob | history
drivers/message/fusion/mptbase.h patch | diff1 | diff2 | blob | history

diff --cc MAINTAINERS
Simple merge
diff --cc drivers/message/fusion/mptbase.c
Simple merge
diff --cc drivers/message/fusion/mptbase.h
Simple merge
Linux 2.6 source tree