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)
commit2741049e66d9698da5e0c90c849406fa3d3fc45c
tree725c927121ccfe3eaa7df3b9b8e46610805f6b15
parent2a298a35ebe060a6f2b06b20c2a34ea188ddfd37
parent4d5cda069b3f0a3bbc18576bc15903ed665d0295
Merge /linux/kernel/git/jejb/scsi-rc-fixes-2.6
MAINTAINERS
drivers/message/fusion/mptbase.c
drivers/message/fusion/mptbase.h