| #
00ab956f |
| 21-Jul-2006 |
Linus Torvalds <torvalds@g5.osdl.org> |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: (38 commits)
[SCSI] More buffer->request_buffer chang
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: (38 commits)
[SCSI] More buffer->request_buffer changes
[SCSI] mptfusion: bump version to 3.04.01
[SCSI] mptfusion: misc fix's
[SCSI] mptfusion: firmware download boot fix's
[SCSI] mptfusion: task abort fix's
[SCSI] mptfusion: sas nexus loss support
[SCSI] mptfusion: sas loginfo update
[SCSI] mptfusion: mptctl panic when loading
[SCSI] mptfusion: sas enclosures with smart drive
[SCSI] NCR_D700: misc fixes (section and argument ordering)
[SCSI] scsi_debug: must_check fixes
[SCSI] scsi_transport_sas: kill the use of channel
[SCSI] scsi_transport_sas: add expander backlink
[SCSI] hide EH backup data outside the scsi_cmnd
[SCSI] ibmvscsi: handle inactive SCSI target during probe
[SCSI] ibmvscsi: allocate lpevents for ibmvscsi on iseries
[SCSI] aic7[9x]xx: Remove last vestiges of reverse_scan
[SCSI] aha152x: stop poking at saved scsi_cmnd members
[SCSI] st.c: Improve sense output
[SCSI] lpfc 8.1.7: Change version number to 8.1.7
...
show more ...
|
|
Revision tags: v2.6.18-rc2 |
|
| #
ba856d32 |
| 11-Jul-2006 |
Eric Moore <eric.moore@lsil.com> |
[SCSI] mptfusion: misc fix's
* removing obsolete 1066, 1066E from Kconfig
* initializing aen_event_read_flag after host reset
* remove oem references
* remove obsolete mpt_pq_filter command line opt
[SCSI] mptfusion: misc fix's
* removing obsolete 1066, 1066E from Kconfig
* initializing aen_event_read_flag after host reset
* remove oem references
* remove obsolete mpt_pq_filter command line option
Signed-off-by: Eric Moore <Eric.Moore@lsil.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
show more ...
|
|
Revision tags: v2.6.18-rc1, v2.6.17, v2.6.17-rc6, v2.6.17-rc5, v2.6.17-rc4, v2.6.17-rc3, v2.6.17-rc2, v2.6.17-rc1 |
|
| #
b0500577 |
| 21-Mar-2006 |
Linus Torvalds <torvalds@g5.osdl.org> |
Merge branch 'origin'
Conflicts:
Documentation/video4linux/CARDLIST.cx88
drivers/media/video/cx88/Kconfig
drivers/media/video/em28xx/em28xx-video.c
drivers/media/video/saa7134/saa7134-dvb.c
Res
Merge branch 'origin'
Conflicts:
Documentation/video4linux/CARDLIST.cx88
drivers/media/video/cx88/Kconfig
drivers/media/video/em28xx/em28xx-video.c
drivers/media/video/saa7134/saa7134-dvb.c
Resolved as in the original merge by Mauro Carvalho Chehab
show more ...
|
| #
1a02e59a |
| 20-Mar-2006 |
Kumar Gala <galak@kernel.crashing.org> |
Merge branch 'master'
|
| #
0f76ee45 |
| 20-Mar-2006 |
Adrian Bunk <bunk@r063144.stusta.swh.mhn.de> |
Merge with git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
|
|
Revision tags: v2.6.16 |
|
| #
c5111f50 |
| 14-Mar-2006 |
Dave Kleikamp <shaggy@austin.ibm.com> |
Merge with /home/shaggy/git/linus-clean/
|
| #
58a343f2 |
| 13-Mar-2006 |
Dmitry Torokhov <dtor_core@ameritech.net> |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
|
Revision tags: v2.6.16-rc6 |
|
| #
9585da37 |
| 28-Feb-2006 |
Kumar Gala <galak@kernel.crashing.org> |
Merge branch 'master' of git+ssh://galak@master.kernel.org/pub/scm/linux/kernel/git/galak/powerpc
|
|
Revision tags: v2.6.16-rc5 |
|
| #
fab8d6dd |
| 24-Feb-2006 |
Anton Altaparmakov <aia21@cantab.net> |
Merge branch 'master' of /home/src/linux-2.6/
|
| #
a00428f5 |
| 23-Feb-2006 |
Paul Mackerras <paulus@samba.org> |
Merge ../powerpc-merge
|
| #
d35462b4 |
| 23-Feb-2006 |
Steven Whitehouse <steve@men-an-tol.chygwyn.com> |
Merge branch 'master'
|
| #
ff607748 |
| 20-Feb-2006 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'upstream'
|
| #
5b2ffed9 |
| 20-Feb-2006 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'master'
|
| #
e601ef22 |
| 18-Feb-2006 |
Steve French <sfrench@us.ibm.com> |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
|
|
Revision tags: v2.6.16-rc4 |
|
| #
b04a92e1 |
| 17-Feb-2006 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'upstream-fixes'
|
| #
26d451b6 |
| 16-Feb-2006 |
Linus Torvalds <torvalds@g5.osdl.org> |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
|
|
Revision tags: v2.6.16-rc3, v2.6.16-rc2 |
|
| #
9cc1cfbc |
| 02-Feb-2006 |
Moore, Eric <Eric.Moore@lsil.com> |
[SCSI] fusion - mptctl - adding support for bus_type=SAS
Add bus_type recognization in ioctl path for SAS.
Signed-off-by: Eric Moore <Eric.Moore@lsil.com>
Signed-off-by: James Bottomley <James.Bott
[SCSI] fusion - mptctl - adding support for bus_type=SAS
Add bus_type recognization in ioctl path for SAS.
Signed-off-by: Eric Moore <Eric.Moore@lsil.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
show more ...
|
|
Revision tags: v2.6.16-rc1, v2.6.15, v2.6.15-rc7, v2.6.15-rc6 |
|
| #
3d5271f9 |
| 06-Dec-2005 |
Len Brown <len.brown@intel.com> |
Pull release into acpica branch
|
|
Revision tags: v2.6.15-rc5, v2.6.15-rc4, v2.6.15-rc3, v2.6.15-rc2 |
|
| #
a9931a6e |
| 17-Nov-2005 |
Jody McIntyre <scjody@modernduck.com> |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
|
| #
f4256e30 |
| 11-Nov-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'master'
|
| #
0da36b34 |
| 11-Nov-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'master'
|
|
Revision tags: v2.6.15-rc1 |
|
| #
e532c378 |
| 11-Nov-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'master'
|
| #
3b621ee5 |
| 11-Nov-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'master'
|
| #
8a87a0b6 |
| 10-Nov-2005 |
James Bottomley <jejb@titanic.(none)> |
Merge by hand (whitespace conflicts in libata.h)
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
|
| #
2f67bdb2 |
| 10-Nov-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'master'
|