1. 11 Oct, 2009 5 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 · ff945afb
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
        Staging: comedi: fix build on arches that don't want comedi drivers
        Staging: comedi: pcmcia irq fixes
        Staging: comedi: ni_pcimio: Added device id for pxi-6225.
        Staging: comedi: ni_65xx.c: fix output inversion problem.
        Staging: comedi: ni_65xx.c: fix insn_bits shift calculation.
        Staging: comedi: s526: fixes for pulse generator
        Staging: comedi: s526: Take account of arch's byte order.
        Staging: comedi: s526: Get rid of global variable 'cmReg'.
        Staging: comedi: s526: Fix number of channels on DIO subdevice
        Staging: comedi: cb_pcidio: fix "section mismatch" error
        Staging: comedi: jr3_pci: Initialize transf variable fully in jr3_pci_poll_subdevice().
        Staging: comedi: Corrected type of a printk argument in resize_async_buffer().
        Staging: p9auth: a few fixes
        Staging: rtl8192e: Add #include <linux/vmalloc.h>
        Staging: iio: Don't build on s390
        Staging: winbond: implement prepare_multicast and fix API usage
        Staging: w35und: Fix ->beacon_int breakage
        Staging: remove cowloop driver
        Staging: remove agnx driver
        Staging: comedi: serial2002: fix include build issue
      ff945afb
    • Linus Torvalds's avatar
      Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging · 4c274fff
      Linus Torvalds authored
      * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
        hwmon: (s3c-hwmon) Disable build for S3C64xx
        MAINTAINERS: Fix Riku Voipio's address
        hwmon: (asus_atk0110) Enable the EC
        hwmon: (asus_atk0110) Refactor the code
        hwmon: (sht15) Fix spurious section mismatch warning
      4c274fff
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable · 474a503d
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
        Btrfs: fix file clone ioctl for bookend extents
        Btrfs: fix uninit compiler warning in cow_file_range_nocow
        Btrfs: constify dentry_operations
        Btrfs: optimize back reference update during btrfs_drop_snapshot
        Btrfs: remove negative dentry when deleting subvolumne
        Btrfs: optimize fsync for the single writer case
        Btrfs: async delalloc flushing under space pressure
        Btrfs: release delalloc reservations on extent item insertion
        Btrfs: delay clearing EXTENT_DELALLOC for compressed extents
        Btrfs: cleanup extent_clear_unlock_delalloc flags
        Btrfs: fix possible softlockup in the allocator
        Btrfs: fix deadlock on async thread startup
      474a503d
    • Alexey Dobriyan's avatar
      headers: remove sched.h from interrupt.h · d43c36dc
      Alexey Dobriyan authored
      After m68k's task_thread_info() doesn't refer to current,
      it's possible to remove sched.h from interrupt.h and not break m68k!
      Many thanks to Heiko Carstens for allowing this.
      Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
      d43c36dc
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 · 69585dd6
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: (34 commits)
        [SCSI] qla2xxx: Fix NULL ptr deref bug in fail path during queue create
        [SCSI] st: fix possible memory use after free after MTSETBLK ioctl
        [SCSI] be2iscsi: Moving to pci_pools v3
        [SCSI] libiscsi: iscsi_session_setup to allow for private space
        [SCSI] be2iscsi: add 10Gbps iSCSI - BladeEngine 2 driver
        [SCSI] zfcp: Fix hang when offlining device with offline chpid
        [SCSI] zfcp: Fix lockdep warning when offlining device with offline chpid
        [SCSI] zfcp: Fix oops during shutdown of offline device
        [SCSI] zfcp: Fix initial device and cfdc for delayed adapter allocation
        [SCSI] zfcp: correctly initialize unchained requests
        [SCSI] mpt2sas: Bump version 02.100.03.00
        [SCSI] mpt2sas: Support dev remove when phy status is MPI2_EVENT_SAS_TOPO_PHYSTATUS_VACANT
        [SCSI] mpt2sas: Timeout occurred within the HANDSHAKE logic while waiting on firmware to ACK.
        [SCSI] mpt2sas: Call init_completion on a per request basis.
        [SCSI] mpt2sas: Target Reset will be issued from Interrupt context.
        [SCSI] mpt2sas: Added SCSIIO, Internal and high priority memory pools to support multiple TM
        [SCSI] mpt2sas: Copyright change to 2009.
        [SCSI] mpt2sas: Added mpi2_history.txt for MPI2 headers.
        [SCSI] mpt2sas: Update driver to MPI2 REV K headers.
        [SCSI] bfa: Brocade BFA FC SCSI driver
        ...
      69585dd6
  2. 09 Oct, 2009 35 commits