#
e6da74e1 |
| 01-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>
|
#
847b9d01 |
| 01-Feb-2006 |
Jaroslav Kysela <perex@suse.cz> |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
|
#
e0ae2355 |
| 31-Jan-2006 |
Linus Torvalds <torvalds@g5.osdl.org> |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
|
#
eb221849 |
| 30-Jan-2006 |
Hannes Reinecke <hare@suse.de> |
[SCSI] aic79xx: Fix timer handling
Fix the timer handling in aic79xx to use the SCSI-ML provided handling instead of implementing our own. It also fixes a deadlock in the command recovery code.
Sig
[SCSI] aic79xx: Fix timer handling
Fix the timer handling in aic79xx to use the SCSI-ML provided handling instead of implementing our own. It also fixes a deadlock in the command recovery code.
Signed-off-by: Hannes Reinecke <hare@suse.de> 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, v2.6.15-rc5, v2.6.15-rc4, v2.6.15-rc3, v2.6.15-rc2, v2.6.15-rc1 |
|
#
2fc29911 |
| 06-Nov-2005 |
Thomas Gleixner <tglx@mtd.linutronix.de> |
Merge branch 'master' of /home/tglx/work/mtd/git/linux-2.6.git/
|
Revision tags: v2.6.14, v2.6.14-rc5, v2.6.14-rc4, v2.6.14-rc3 |
|
#
4e0c1159 |
| 25-Sep-2005 |
Dave Airlie <airlied@starflyer.(none)> |
update from upstream
|
Revision tags: v2.6.14-rc2 |
|
#
d7f6884a |
| 14-Sep-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge /spare/repo/linux-2.6/
|
Revision tags: v2.6.14-rc1 |
|
#
d344c5e0 |
| 10-Sep-2005 |
Dmitry Torokhov <dtor_core@ameritech.net> |
Manual merge with Linus
|
#
344a0761 |
| 08-Sep-2005 |
Tony Luck <tony.luck@intel.com> |
[IA64] Manual merge fix for 3 files
arch/ia64/Kconfig arch/ia64/kernel/acpi.c include/asm-ia64/irq.h
Signed-off-by: Tony Luck <tony.luck@intel.com>
|
#
1d6ae775 |
| 08-Sep-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge /spare/repo/linux-2.6/
|
#
142e27fc |
| 08-Sep-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge /spare/repo/linux-2.6/
|
#
c324b44c |
| 08-Sep-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge /spare/repo/linux-2.6/
|
#
5a2cec83 |
| 08-Sep-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge /spare/repo/linux-2.6/
|
#
64e47488 |
| 08-Sep-2005 |
Len Brown <len.brown@intel.com> |
Merge linux-2.6 with linux-acpi-2.6
|
#
0481990b |
| 08-Sep-2005 |
Linus Torvalds <torvalds@g5.osdl.org> |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
|
Revision tags: v2.6.13 |
|
#
7a93aef7 |
| 28-Aug-2005 |
James Bottomley <jejb@titanic.(none)> |
Merge HEAD from ../scsi-misc-2.6-tmp
|
Revision tags: v2.6.13-rc7, v2.6.13-rc6 |
|
#
a2ae85df |
| 07-Aug-2005 |
akpm@osdl.org <akpm@osdl.org> |
[SCSI] aic79xx: needs to select SPI_TRANSPORT_ATTRS
without it you get this failure:
drivers/built-in.o(.text+0xdcccd): In function `ahd_linux_slave_configure': drivers/scsi/aic7xxx/aic79xx_osm.c:6
[SCSI] aic79xx: needs to select SPI_TRANSPORT_ATTRS
without it you get this failure:
drivers/built-in.o(.text+0xdcccd): In function `ahd_linux_slave_configure': drivers/scsi/aic7xxx/aic79xx_osm.c:636: undefined reference to `spi_dv_device' drivers/built-in.o(.text+0xdd7b1): In function `ahd_send_async': drivers/scsi/aic7xxx/aic79xx_osm.c:1652: undefined reference to `spi_display_xfer_agreement' drivers/built-in.o(.init.text+0x7b4d): In function `ahd_linux_init': drivers/scsi/aic7xxx/aic79xx_osm.c:2765: undefined reference to `spi_attach_transport' drivers/built-in.o(.init.text+0x7c94):drivers/scsi/aic7xxx/aic79xx_osm.c:2774: undefined reference to `spi_release_transport' drivers/built-in.o(.exit.text+0x72c): In function `ahd_linux_exit': drivers/scsi/aic7xxx/aic79xx_osm.c:2783: undefined reference to `spi_release_transport'
Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
show more ...
|
Revision tags: v2.6.13-rc5, v2.6.13-rc4, v2.6.13-rc3, v2.6.13-rc2, v2.6.13-rc1, v2.6.12, v2.6.12-rc6, v2.6.12-rc5, v2.6.12-rc4, v2.6.12-rc3, v2.6.12-rc2 |
|
#
1da177e4 |
| 17-Apr-2005 |
Linus Torvalds <torvalds@ppc970.osdl.org> |
Linux-2.6.12-rc2
Initial git repository build. I'm not bothering with the full history, even though we have it. We can create a separate "historical" git archive of that later if we want to, and in
Linux-2.6.12-rc2
Initial git repository build. I'm not bothering with the full history, even though we have it. We can create a separate "historical" git archive of that later if we want to, and in the meantime it's about 3.2GB when imported into git - space that would just make the early git days unnecessarily complicated, when we don't have a lot of good infrastructure for it.
Let it rip!
show more ...
|