1. 16 Jul, 2007 38 commits
  2. 15 Jul, 2007 2 commits
    • Linus Torvalds's avatar
      Merge git://git.infradead.org/battery-2.6 · 8f41958b
      Linus Torvalds authored
      * git://git.infradead.org/battery-2.6:
        git-battery vs git-acpi
        Power supply class and drivers: remove non obligatory return statements
        pda_power: clean up irq, timer
        MAINTAINERS: Add maintainers for power supply subsystem and drivers
      
      Fixed up trivial conflict in drivers/w1/slaves/w1_ds2760.c manually
      8f41958b
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 · bc06cffd
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (166 commits)
        [SCSI] ibmvscsi: convert to use the data buffer accessors
        [SCSI] dc395x: convert to use the data buffer accessors
        [SCSI] ncr53c8xx: convert to use the data buffer accessors
        [SCSI] sym53c8xx: convert to use the data buffer accessors
        [SCSI] ppa: coding police and printk levels
        [SCSI] aic7xxx_old: remove redundant GFP_ATOMIC from kmalloc
        [SCSI] i2o: remove redundant GFP_ATOMIC from kmalloc from device.c
        [SCSI] remove the dead CYBERSTORMIII_SCSI option
        [SCSI] don't build scsi_dma_{map,unmap} for !HAS_DMA
        [SCSI] Clean up scsi_add_lun a bit
        [SCSI] 53c700: Remove printk, which triggers because of low scsi clock on SNI RMs
        [SCSI] sni_53c710: Cleanup
        [SCSI] qla4xxx: Fix underrun/overrun conditions
        [SCSI] megaraid_mbox: use mutex instead of semaphore
        [SCSI] aacraid: add 51245, 51645 and 52245 adapters to documentation.
        [SCSI] qla2xxx: update version to 8.02.00-k1.
        [SCSI] qla2xxx: add support for NPIV
        [SCSI] stex: use resid for xfer len information
        [SCSI] Add Brownie 1200U3P to blacklist
        [SCSI] scsi.c: convert to use the data buffer accessors
        ...
      bc06cffd