diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-04 12:21:11 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-04 12:21:11 -0800 |
| commit | e3c0ac04f980750a368f7cd5f1b8d1d2cdc1f735 (patch) | |
| tree | 134501057a244b8ae18b87647a7574e4a36e4b5b /net/ipv4/tunnel4.c | |
| parent | 943547abdfe9b4e27e36a25987909619908dffbf (diff) | |
| parent | 6f4a7f4183bdbd02741dcd8edbd10b8628acc5d5 (diff) | |
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
PHY: Add the phy_device_release device method.
gianfar: fix compile warning
pasemi_mac: Fix reuse of free'd skb
SMC911X: Fix using of dereferenced skb after netif_rx
sky2: recovery deadlock fix
Fix memory corruption in fec_mpc52xx
Don't claim to do IPv6 checksum offload
cxgb - revert file mode changes.
Diffstat (limited to 'net/ipv4/tunnel4.c')
0 files changed, 0 insertions, 0 deletions