1. 03 3月, 2007 31 次提交
  2. 02 3月, 2007 9 次提交
    • L
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev · 562aa1d4
      Linus Torvalds 提交于
      * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
        ahci: improve spurious SDB FIS handling
        ahci/pata_jmicron: match class not function number
        jmicron ATA: reimplement jmicron ATA quirk
        pata_jmicron: drop unnecessary device programming in [re]init
        libata: blacklist FUJITSU MHT2060BH for NCQ
        sata_sil24: kill unused local variable idx in sil24_fill_sg()
        libata: clear drvdata in ata_host_release(), take#2
      562aa1d4
    • L
      Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid · b4350861
      Linus Torvalds 提交于
      * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid:
        HID: fix Logitech DiNovo Edge touchwheel and Logic3 /SpectraVideo middle button
        HID: add git tree information to MAINTAINERS
        HID: fix broken Logitech S510 keyboard report descriptor; make extra keys work
        HID: fix possible double-free on error path in hid parser
        HID: hid-debug.c should #include <linux/hid-debug.h>
        HID: fix bug in zeroing the last field byte in output reports
        USB HID: use CONFIG_HID_DEBUG for outputting report descriptor
        USB HID: Fix USB vendor and product IDs endianness for USB HID devices
      b4350861
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 · 132a69c6
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
        [SPARC64]: Fix parport_pc build.
        [SPARC64]: Update defconfig.
      132a69c6
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · fb7d4045
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
        [TCP]: Fix minisock tcp_create_openreq_child() typo.
        [TCP]: Document several sysctls.
        [NET]: Fix kfree(skb)
        [NET]: Handle disabled preemption in gfp_any()
        [BRIDGE]: Fix locking of set path cost.
        [IPV6]: /proc/net/anycast6 unbalanced inet6_dev refcnt
        [IPX]: Remove ancient changelog
        [IPX]: Remove outdated information from Kconfig
        [NET]: Revert socket.h/stat.h ifdef hacks.
        [IPV6]: anycast refcnt fix
        [XFRM] xfrm_user: Fix return values of xfrm_add_sa_expire.
      fb7d4045
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb · 100b4254
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
        V4L/DVB (5305): Mark VIDIOC_DBG_S/G_REGISTER as experimental
        V4L/DVB (5271): Add VIDIOC_TRY_ENCODER_CMD and VIDIOC_ENCODER_CMD ioctls.
        V4L/DVB (5270): Add VIDIOC_G_ENC_INDEX ioctl
        V4L/DVB (5276): Cxusb: fix firmware patch for big endian systems
        V4L/DVB (5258): Cafe_ccic: fix compiler warning
        V4L/DVB (5295): Digitv: open nxt6000 i2c_gate for TDED4 tuner handling
        V4L/DVB (5304): Improve chip matching in v4l2_register
        V4L/DVB (5255): Fix cx25840 firmware loading.
      100b4254
    • R
      [PATCH] Fix sysfs build breakage if !CONFIG_SYSFS · d701d8a3
      Ralf Baechle 提交于
      B0rkage introduced by dfa87c82.
      Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      d701d8a3
    • T
      ahci: improve spurious SDB FIS handling · afb2d552
      Tejun Heo 提交于
      Spurious SDB FIS during NCQ might not contain spurious completions.
      It could be spurious TF update or invalid async notification.  Treat
      as HSM violation iff a spurious SDB FIS contains spurious completions;
      otherwise, just whine once about it.
      Signed-off-by: NTejun Heo <htejun@gmail.com>
      Signed-off-by: NJeff Garzik <jeff@garzik.org>
      afb2d552
    • T
      ahci/pata_jmicron: match class not function number · e34bb370
      Tejun Heo 提交于
      Make jmiron_ata quirk update pdev->class after programming the device
      and update ahci and pata_jmicron such that they match class code
      instead of checking function number manually.  For ahci, it matches
      for vendor and class.  For pata_jmicron, it matches vendor, device and
      class as IDE class isn't as well defined as AHCI class.
      
      This makes jmicron device matching more conventional and script
      friendly.
      Signed-off-by: NTejun Heo <htejun@gmail.com>
      Signed-off-by: NJeff Garzik <jeff@garzik.org>
      e34bb370
    • T
      jmicron ATA: reimplement jmicron ATA quirk · 5ee2ae7f
      Tejun Heo 提交于
      Reimplement jmicron ATA quirk.
      
      * renamed to quirk_jmicron_ata()
      * quirk is invoked only for the affected controllers
      * programming is stricter.  e.g. conf5 bit24 is cleared if
        unnecessary.
      * code factored for readability
      * JMB360 and JMB368 are programmed into proper mode
      
      Verified on JMB360, 363 and 368.
      Signed-off-by: NTejun Heo <htejun@gmail.com>
      Signed-off-by: NJeff Garzik <jeff@garzik.org>
      5ee2ae7f