diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-14 14:19:44 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-14 14:19:44 -0400 |
commit | ae42d8d44195a614c78a636683fe65ed31744cbd (patch) | |
tree | cea10bac1e440f0b7ae6c56dbe9bdb44880a3ce2 /fs/dlm/midcomms.c | |
parent | 0eead9ab41da33644ae2c97c57ad03da636a0422 (diff) | |
parent | 71085ce8285dc5f3011694f6ba7259201135c6d6 (diff) |
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:
ehea: Fix a checksum issue on the receive path
net: allow FEC driver to use fixed PHY support
tg3: restore rx_dropped accounting
b44: fix carrier detection on bind
net: clear heap allocations for privileged ethtool actions
NET: wimax, fix use after free
ATM: iphase, remove sleep-inside-atomic
ATM: mpc, fix use after free
ATM: solos-pci, remove use after free
net/fec: carrier off initially to avoid root mount failure
r8169: use device model DMA API
r8169: allocate with GFP_KERNEL flag when able to sleep
Diffstat (limited to 'fs/dlm/midcomms.c')
0 files changed, 0 insertions, 0 deletions