1. 11 8月, 2010 38 次提交
  2. 10 8月, 2010 2 次提交
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · f6cec0ae
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (59 commits)
        igbvf.txt: Add igbvf Documentation
        igb.txt: Add igb documentation
        e100/e1000*/igb*/ixgb*: Add missing read memory barrier
        ixgbe: fix build error with FCOE_CONFIG without DCB_CONFIG
        netxen: protect tx timeout recovery by rtnl lock
        isdn: gigaset: use after free
        isdn: gigaset: add missing unlock
        solos-pci: Fix race condition in tasklet RX handling
        pkt_sched: Fix sch_sfq vs tcf_bind_filter oops
        net: disable preemption before call smp_processor_id()
        tcp: no md5sig option size check bug
        iwlwifi: fix locking assertions
        iwlwifi: fix TX tracer
        isdn: fix information leak
        net: Fix napi_gro_frags vs netpoll path
        usbnet: remove noisy and hardly useful printk
        rtl8180: avoid potential NULL deref in rtl8180_beacon_work
        ath9k: Remove myself from the MAINTAINERS list
        libertas: scan before assocation if no BSSID was given
        libertas: fix association with some APs by using extended rates
        ...
      f6cec0ae
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6 · 0fcf12d5
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6:
        tx493xide: use min_t() macro instead of min()
        drivers/ide: Use memdup_user
        via82cxxx: fix typo for VT6415 PCIE PATA IDE Host Controller support.
        ide-cd: Do not access completed requests in the irq handler
      0fcf12d5