1. 15 Apr, 2006 4 commits
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 · f05472f1
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: (679 commits)
        commit 7676f83a
        Author: James Bottomley <James.Bottomley@steeleye.com>
        Date:   Fri Apr 14 09:47:59 2006 -0500
        
            [SCSI] scsi_transport_sas: don't scan a non-existent end device
            
            Any end device that can't support any of the scanning protocols
            shouldn't be scanned, so set its id to -1 to prevent
            scsi_scan_target() being called for it.
      Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
        
        commit 3c0c25b9
        Author: Moore, Eric <Eric.Moore@lsil.com>
        Date:   Thu Apr 13 16:08:17 2006 -0600
        
            [SCSI] mptfusion - fix panic in mptsas_slave_configure
            
            Driver panic when RAID logical volume was present when driver
            loaded, or when a RAID logical volume was created on the fly.
        ...
      f05472f1
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6 · 11f16971
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6: (78 commits)
        commit e97b81dd
        Author: Mark M. Hoffman <mhoffman@lightlink.com>
        Date:   Thu Mar 23 16:50:25 2006 +0100
        
            [PATCH] i2c-parport: Make type parameter mandatory
            
            This patch forces the user to specify what type of adapter is present when
            loading i2c-parport or i2c-parport-light.  If none is specified, the driver
            init simply fails - instead of assuming adapter type 0.
            
            This alleviates the sometimes lengthy boot time delays which can be caused
            by accidentally building one of these into a kernel along with several i2c
            slave drivers that have lengthy probe routines (e.g. hwmon drivers).
            
            Kconfig and documentation updated accordingly.
      Signed-off-by: default avatarMark M. Hoffman <mhoffman@lightlink.com>
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
        
        ...
      11f16971
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6 · bcdc0842
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6: (169 commits)
        commit 78a596b4
        Author: Adrian Bunk <bunk@stusta.de>
        Date:   Fri Mar 31 01:38:12 2006 -0800
        
            [PATCH] remove kernel/power/pm.c:pm_unregister()
            
            Since the last user is removed in -mm, we can now remove this long deprecated
            function.
      Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
            Cc: Pavel Machek <pavel@ucw.cz>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
        
        commit 21440d31
        Author: David Brownell <david-b@pacbell.net>
        Date:   Sat Apr 1 10:21:52 2006 -0800
        
            [PATCH] dma doc updates
            
        ...
      bcdc0842
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6 · 754a264c
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6: (158 commits)
        commit 4f705ae3
        Author: Bjorn Helgaas <bjorn.helgaas@hp.com>
        Date:   Mon Apr 3 17:09:22 2006 -0700
        
            [PATCH] DMI: move dmi_scan.c from arch/i386 to drivers/firmware/
            
            dmi_scan.c is arch-independent and is used by i386, x86_64, and ia64.
            Currently all three arches compile it from arch/i386, which means that ia64
            and x86_64 depend on things in arch/i386 that they wouldn't otherwise care
            about.
            
            This is simply "mv arch/i386/kernel/dmi_scan.c drivers/firmware/" (removing
            trailing whitespace) and the associated Makefile changes.  All three
            architectures already set CONFIG_DMI in their top-level Kconfig files.
      Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
            Cc: Andi Kleen <ak@muc.de>
            Cc: "Luck, Tony" <tony.luck@intel.com>
            Cc: Andrey Panin <pazke@orbita1.ru>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
        ...
      754a264c
  2. 14 Apr, 2006 36 commits