• Linus Torvalds's avatar
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 608307e6
    Linus Torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (26 commits)
      pkt_sched: Fix lockdep warning on est_tree_lock in gen_estimator
      ipvs: avoid oops for passive FTP
      Revert "sky2: don't do GRO on second port"
      gro: fix different skb headrooms
      bridge: Clear INET control block of SKBs passed into ip_fragment().
      3c59x: Remove incorrect locking; correct documented lock hierarchy
      sky2: don't do GRO on second port
      ipv4: minor fix about RPF in help of Kconfig
      xfrm_user: avoid a warning with some compiler
      net/sched/sch_hfsc.c: initialize parent's cl_cfmin properly in init_vf()
      pxa168_eth: fix a mdiobus leak
      net sched: fix kernel leak in act_police
      vhost: stop worker only if created
      MAINTAINERS: Add ehea driver as Supported
      ath9k_hw: fix parsing of HT40 5 GHz CTLs
      ath9k_hw: Fix EEPROM uncompress block reading on AR9003
      wireless: register wiphy rfkill w/o holding cfg80211_mutex
      netlink: Make NETLINK_USERSOCK work again.
      irda: Correctly clean up self->ias_obj on irda_bind() failure.
      wireless extensions: fix kernel heap content leak
      ...
    608307e6
pcnet_cs.c 62.8 KB