summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-06-11 14:20:03 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-06-11 14:20:03 -0700
commit4cea8706c39023f5f721c88dd0ae17a097a39c98 (patch)
tree7eb589399dc10944cde2802d68adb5511405446f /Makefile
parent7ae1277a5202109a31d8f81ac99d4a53278dab84 (diff)
parente79aa8671033535c2e9ffc0a68010ae49ed5734c (diff)
downloadlinux-3.10-4cea8706c39023f5f721c88dd0ae17a097a39c98.tar.gz
linux-3.10-4cea8706c39023f5f721c88dd0ae17a097a39c98.tar.bz2
linux-3.10-4cea8706c39023f5f721c88dd0ae17a097a39c98.zip
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
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions