| #
2dc94310 |
| 27-Sep-2006 |
Russell King <rmk@dyn-67.arm.linux.org.uk> |
Merge master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-upstream into devel
|
| #
363e065c |
| 25-Sep-2006 |
Steven Whitehouse <swhiteho@redhat.com> |
[GFS2] Fix up merge of Linus' kernel into GFS2
This fixes up a couple of conflicts when merging up with
Linus' latest kernel. This will hopefully allow GFS2 to
be more easily merged into forthcoming
[GFS2] Fix up merge of Linus' kernel into GFS2
This fixes up a couple of conflicts when merging up with
Linus' latest kernel. This will hopefully allow GFS2 to
be more easily merged into forthcoming -mm and FC kernels
due to the "one line per header" format now used for the
kernel headers.
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Conflicts:
include/linux/Kbuild
include/linux/kernel.h
show more ...
|
| #
02b25fcf |
| 24-Sep-2006 |
David Woodhouse <dwmw2@infradead.org> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
| #
23930fa1 |
| 24-Sep-2006 |
Jeff Garzik <jeff@garzik.org> |
Merge branch 'master' into upstream
|
| #
f164c421 |
| 23-Sep-2006 |
Linus Torvalds <torvalds@g5.osdl.org> |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (94 commits)
[SCSI] SPI transport class: misc DV fixes
[SCS
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (94 commits)
[SCSI] SPI transport class: misc DV fixes
[SCSI] Switch some more scsi drivers to pci_get_device and refcounted pci structures
[SCSI] eata_pio cleanup and PCI fix
[SCSI] aacraid: README update
[SCSI] aacraid: remove scsi_remove_device
[SCSI] aacraid: merge rx and rkt code
[SCSI] aacraid: expose physical devices
[SCSI] aacraid: misc cleanup
[SCSI] zfcp: update maintainers file
[SCSI] zfcp: update maintainers file
[SCSI] zfcp: fix: avoid removal of fsf reqs before qdio queues are down
[SCSI] zfcp: introduce struct timer_list in struct zfcp_fsf_req
[SCSI] zfcp: fix: use correct req_id in eh_abort_handler
[SCSI] zfcp: create private slab caches to guarantee proper data alignment
[SCSI] zfcp: remove zfcp_ccw_unregister function
[SCSI] aic7xxx: pause sequencer before touching SBLKCTL
[SCSI] aic7xxx: avoid checking SBLKCTL register for certain cards
[SCSI] scsi_debug version 1.80
[SCSI] megaraid: Make megaraid_ioctl() check copy_to_user() return value
[SCSI] aha152x: remove static host array
...
show more ...
|
| #
c9802cd9 |
| 23-Sep-2006 |
James Bottomley <jejb@sparkweed.localdomain> |
Merge mulgrave-w:git/scsi-misc-2.6
Conflicts:
drivers/scsi/iscsi_tcp.c
drivers/scsi/iscsi_tcp.h
Pretty horrible merge between crypto hash consolidation
and crypto_digest_...->crypto_hash_... con
Merge mulgrave-w:git/scsi-misc-2.6
Conflicts:
drivers/scsi/iscsi_tcp.c
drivers/scsi/iscsi_tcp.h
Pretty horrible merge between crypto hash consolidation
and crypto_digest_...->crypto_hash_... conversion
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
show more ...
|
|
Revision tags: v2.6.18 |
|
| #
0612ec48 |
| 19-Sep-2006 |
Dmitry Torokhov <dtor@insightbb.com> |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
| #
9b4f2e95 |
| 17-Sep-2006 |
Stefan Richter <stefanr@s5r6.in-berlin.de> |
ieee1394: merge from Linus
Conflicts: drivers/ieee1394/hosts.c
Patch "lockdep: annotate ieee1394 skb-queue-head locking" was meddling
with patch "ieee1394: fix kerneldoc of hpsb_alloc_host".
Signed
ieee1394: merge from Linus
Conflicts: drivers/ieee1394/hosts.c
Patch "lockdep: annotate ieee1394 skb-queue-head locking" was meddling
with patch "ieee1394: fix kerneldoc of hpsb_alloc_host".
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
show more ...
|
|
Revision tags: v2.6.18-rc7 |
|
| #
115b384c |
| 05-Sep-2006 |
Dave Jones <davej@redhat.com> |
Merge ../linus
|
| #
23e735bc |
| 05-Sep-2006 |
Dave Jones <davej@redhat.com> |
Merge ../linus
|
|
Revision tags: v2.6.18-rc6, v2.6.18-rc5 |
|
| #
26dacd0c |
| 18-Aug-2006 |
James Smart <James.Smart@Emulex.Com> |
[SCSI] lpfc 8.1.10 : Change version number to 8.1.10
Change version number to 8.1.10
Signed-off-by: James Smart <James.Smart@emulex.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
|
| #
aa43f779 |
| 31-Aug-2006 |
Paul Mackerras <paulus@samba.org> |
Merge branch 'merge'
|
| #
0a7d5f8c |
| 30-Aug-2006 |
David Woodhouse <dwmw2@infradead.org> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
| #
b01e86fe |
| 29-Aug-2006 |
Jeff Garzik <jeff@garzik.org> |
Merge /spare/repo/linux-2.6 into upstream
|
| #
a422142c |
| 29-Aug-2006 |
Jeff Garzik <jeff@garzik.org> |
Merge branch 'master' into upstream
|
| #
e4ac2663 |
| 29-Aug-2006 |
John W. Linville <linville@tuxdriver.com> |
Merge branch 'from-linus' into upstream
|
| #
83b7a664 |
| 29-Aug-2006 |
Steven Whitehouse <swhiteho@redhat.com> |
Merge branch 'master' into gfs2
|
| #
8ce7a9c1 |
| 27-Aug-2006 |
James Bottomley <jejb@mulgrave.il.steeleye.com> |
Merge ../linux-2.6
|
| #
f834c755 |
| 26-Aug-2006 |
Greg Kroah-Hartman <gregkh@suse.de> |
Merge gregkh@master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
|
| #
48e2691f |
| 17-Aug-2006 |
James Smart <James.Smart@Emulex.Com> |
[SCSI] lpfc 8.1.9 : Change version number to 8.1.9
Change version number to 8.1.9
Signed-off-by: James Smart <James.Smart@emulex.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
|
|
Revision tags: v2.6.18-rc4 |
|
| #
416780d3 |
| 01-Aug-2006 |
James Smart <James.Smart@Emulex.Com> |
[SCSI] lpfc 8.1.7 : Change version number to 8.1.8
Change version number to 8.1.8
Signed-off-by: James Smart <James.Smart@emulex.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
|
| #
d932cb7e |
| 04-Aug-2006 |
Dmitry Torokhov <dtor@insightbb.com> |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
|
| #
57cad808 |
| 31-Jul-2006 |
Paul Mackerras <paulus@samba.org> |
Merge branch 'merge'
|
| #
b1b934d3 |
| 31-Jul-2006 |
Steven Whitehouse <swhiteho@redhat.com> |
Merge branch 'master'
|
|
Revision tags: v2.6.18-rc3 |
|
| #
20f99dcf |
| 27-Jul-2006 |
John W. Linville <linville@tuxdriver.com> |
Merge branch 'from-linus' into upstream
|