diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-13 15:20:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-13 15:20:51 -0700 |
| commit | 298eaaad0edc004912513d7b9e18163bc053539b (patch) | |
| tree | 9e0e6dd9c54e4af80b0c671de87a71d018f79c38 /net/ipx | |
| parent | cf70cc5b9d6a07d21ffd521aee690d26315d1bdf (diff) | |
| parent | cb68552858c64db302771469b1202ea09e696329 (diff) | |
| download | linux-298eaaad0edc004912513d7b9e18163bc053539b.tar.bz2 | |
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:
bridge: fix forwarding of IPv6
bonding,llc: Fix structure sizeof incompatibility for some PDUs
ipv6: restore correct ECN handling on TCP xmit
ne-h8300: Fix regression caused during net_device_ops conversion
hydra: Fix regression caused during net_device_ops conversion
zorro8390: Fix regression caused during net_device_ops conversion
sfc: Always map MCDI shared memory as uncacheable
ehea: Fix memory hotplug oops
libertas: fix cmdpendingq locking
iwlegacy: fix IBSS mode crashes
ath9k: Fix a warning due to a queued work during S3 state
mac80211: don't start the dynamic ps timer if not associated
Diffstat (limited to 'net/ipx')
0 files changed, 0 insertions, 0 deletions