1. 16 Jul, 2007 36 commits
  2. 15 Jul, 2007 4 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
    • Linus Torvalds's avatar
      Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · d3502d7f
      Linus Torvalds authored
      * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (53 commits)
        [TCP]: Verify the presence of RETRANS bit when leaving FRTO
        [IPV6]: Call inet6addr_chain notifiers on link down
        [NET_SCHED]: Kill CONFIG_NET_CLS_POLICE
        [NET_SCHED]: act_api: qdisc internal reclassify support
        [NET_SCHED]: sch_dsmark: act_api support
        [NET_SCHED]: sch_atm: act_api support
        [NET_SCHED]: sch_atm: Lindent
        [IPV6]: MSG_ERRQUEUE messages do not pass to connected raw sockets
        [IPV4]: Cleanup call to __neigh_lookup()
        [NET_SCHED]: Revert "avoid transmit softirq on watchdog wakeup" optimization
        [NETFILTER]: nf_conntrack: UDPLITE support
        [NETFILTER]: nf_conntrack: mark protocols __read_mostly
        [NETFILTER]: x_tables: add connlimit match
        [NETFILTER]: Lower *tables printk severity
        [NETFILTER]: nf_conntrack: Don't track locally generated special ICMP error
        [NETFILTER]: nf_conntrack: Introduces nf_ct_get_tuplepr and uses it
        [NETFILTER]: nf_conntrack: make l3proto->prepare() generic and renames it
        [NETFILTER]: nf_conntrack: Increment error count on parsing IPv4 header
        [NET]: Add ethtool support for NETIF_F_IPV6_CSUM devices.
        [AF_IUCV]: Add lock when updating accept_q
        ...
      d3502d7f
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs · d2a9a8de
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
        9p: fix a race condition bug in umount which caused a segfault
        9p: re-enable mount time debug option
        9p: cache meta-data when cache=loose
        net/9p: set error to EREMOTEIO if trans->write returns zero
        net/9p: change net/9p module name to 9pnet
        9p: Reorganization of 9p file system code
      d2a9a8de