1. 10 Jul, 2007 36 commits
  2. 09 Jul, 2007 4 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 · 71780f59
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: (31 commits)
        firewire: fw-sbp2: fix DMA mapping of management ORBs
        firewire: fw-sbp2: fix DMA mapping of command ORBs
        firewire: fw-sbp2: fix DMA mapping of S/G tables
        firewire: fw-sbp2: add a boundary check
        firewire: fw-sbp2: correctly align page tables
        firewire: fw-sbp2: memset wants string.h
        firewire: fw-sbp2: use correct speed in sbp2_agent_reset
        firewire: fw-sbp2: correctly dereference by container_of
        firewire: Document userspace ioctl interface.
        firewire: fw-sbp2: implement nonexclusive login
        firewire: fw-sbp2: let SCSI shutdown commands through before logout
        firewire: fw-sbp2: implement max sectors limit for some old bridges
        firewire: simplify a struct type
        firewire: support S100B...S400B and link slower than PHY
        firewire: optimize gap count with 1394b leaf nodes
        firewire: remove unused macro
        firewire: missing newline in printk
        firewire: fw-sbp2: remove unused struct member
        ieee1394: remove old isochronous ABI
        ieee1394: sbp2: change some module parameters from int to bool
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · 36b77410
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
        HID: handle cases of volume knobs generating relative values
        HID: Logitech keyboard 0xc311 needs reset leds quirk
        HID: support for logitech cordless desktop LX500 special mapping
        HID: fix autocentering of PID devices
        HID: separate quirks for report descriptor fixup
        HID: Add NOGET quirk for all NCR devices
        HID: support for Petalynx Maxter remote control
        HID: fix mismatch between hid-input HUT find/search mapping and the HUT
        HID: support for Gameron dual psx adaptor
        USB HID: avoid flush_scheduled_work()
        HID: Use menuconfig objects
        HID: force hid-input for Microsoft SideWinder GameVoice device
        HID: input mapping for Chicony KU-0418 tactical pad
        HID: make debugging output runtime-configurable
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 · 71ba22fa
      Linus Torvalds authored
      * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (75 commits)
        Ethernet driver for EISA only SNI RM200/RM400 machines
        Extract chip specific code out of lasi_82596.c
        ehea: Whitespace cleanup
        pasemi_mac: Fix TX interrupt threshold
        spidernet: Replace literal with const
        r8169: perform RX config change after mac filtering
        r8169: mac address change support
        r8169: display some extra debug information during startup
        r8169: add endianess annotations to [RT]xDesc
        r8169: align the IP header when there is no DMA constraint
        r8169: add bit description for the TxPoll register
        r8169: cleanup
        r8169: remove the media option
        r8169: small 8101 comment
        r8169: confusion between hardware and IP header alignment
        r8169: merge with version 8.001.00 of Realtek's r8168 driver
        r8169: merge with version 6.001.00 of Realtek's r8169 driver
        r8169: prettify mac_version
        r8169: populate the hw_start handler for the 8110
        r8169: populate the hw_start handler for the 8168
    • Stefan Richter's avatar
      firewire: fw-sbp2: fix DMA mapping of management ORBs · 7aa48481
      Stefan Richter authored
      The CPU must not touch the buffer after it was DMA-mapped.
      Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
      Signed-off-by: default avatarKristian Høgsberg <krh@redhat.com>