• Linus Torvalds's avatar
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 6e429101
    Linus Torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
      3c509: Add missing EISA IDs
      MAINTAINERS: take maintainership of the cpmac Ethernet driver
      net/firmare: Ignore .cis files
      ath1e: add new device id for asus hardware
      mlx4_en: Fix a kernel panic when waking tx queue
      rtl8187: add USB ID for Linksys WUSB54GC-EU v2 USB wifi dongle
      at76c50x-usb: avoid mutex deadlock in at76_dwork_hw_scan
      mac8390: fix build with NET_POLL_CONTROLLER
      cxgb3: link fault fixes
      cxgb3: fix dma mapping regression
      netfilter: nfnetlink_log: fix wrong skbuff size	calculation
      netfilter: xt_hashlimit does a wrong SEQ_SKIP
      bfin_mac: fix build error due to net_device_ops convert
      atlx: move modinfo data from atlx.h to atl1.c
      gianfar: fix babbling rx error event bug
      cls_cgroup: read classid atomically in classifier
      netfilter: nf_ct_dccp: add missing DCCP protocol changes in event cache
      netfilter: nf_ct_tcp: fix accepting invalid RST segments