1. 06 Dec, 2006 3 commits
    • David Howells's avatar
      06328b4f
    • David Howells's avatar
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 · 4796b71f
      David Howells authored
      
      
      Conflicts:
      
      	drivers/pcmcia/ds.c
      
      Fix up merge failures with Linus's head and fix new compile failures.
      Signed-Off-By: default avatarDavid Howells <dhowells@redhat.com>
      4796b71f
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 · ec0bf39a
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (73 commits)
        [SCSI] aic79xx: Add ASC-29320LPE ids to driver
        [SCSI] stex: version update
        [SCSI] stex: change wait loop code
        [SCSI] stex: add new device type support
        [SCSI] stex: update device id info
        [SCSI] stex: adjust default queue length
        [SCSI] stex: add value check in hard reset routine
        [SCSI] stex: fix controller_info command handling
        [SCSI] stex: fix biosparam calculation
        [SCSI] megaraid: fix MMIO casts
        [SCSI] tgt: fix undefined flush_dcache_page() problem
        [SCSI] libsas: better error handling in sas_expander.c
        [SCSI] lpfc 8.1.11 : Change version number to 8.1.11
        [SCSI] lpfc 8.1.11 : Misc Fixes
        [SCSI] lpfc 8.1.11 : Add soft_wwnn sysfs attribute, rename soft_wwn_enable
        [SCSI] lpfc 8.1.11 : Removed decoding of PCI Subsystem Id
        [SCSI] lpfc 8.1.11 : Add MSI (Message Signalled Interrupts) support
        [SCSI] lpfc 8.1.11 : Adjust LOG_FCP logging
        [SCSI] lpfc 8.1.11 : Fix Memory leaks
        [SCSI] lpfc 8.1.11 : Fix lpfc_multi_ring_support
        ...
      ec0bf39a
  2. 05 Dec, 2006 37 commits