tree 7eb589399dc10944cde2802d68adb5511405446f
parent 7ae1277a5202109a31d8f81ac99d4a53278dab84
parent e79aa8671033535c2e9ffc0a68010ae49ed5734c
author Linus Torvalds <torvalds@linux-foundation.org> 1276291203 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1276291203 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  wimax/i2400m: fix missing endian correction read in fw loader
  net8139: fix a race at the end of NAPI
  pktgen: Fix accuracy of inter-packet delay.
  pkt_sched: gen_estimator: add a new lock
  net: deliver skbs on inactive slaves to exact matches
  ipv6: fix ICMP6_MIB_OUTERRORS
  r8169: fix mdio_read and update mdio_write according to hw specs
  gianfar: Revive the driver for eTSEC devices (disable timestamping)
  caif: fix a couple range checks
  phylib: Add support for the LXT973 phy.
  net: Print num_rx_queues imbalance warning only when there are allocated queues