diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-11 23:20:03 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-11 23:20:03 +0200 |
| commit | 4cea8706c39023f5f721c88dd0ae17a097a39c98 (patch) | |
| tree | 7eb589399dc10944cde2802d68adb5511405446f /arch/x86/mm/kmmio.c | |
| parent | Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafa... (diff) | |
| parent | Merge branch 'wimax-2.6.35.y' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| download | linux-4cea8706c39023f5f721c88dd0ae17a097a39c98.tar.xz linux-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 'arch/x86/mm/kmmio.c')
0 files changed, 0 insertions, 0 deletions