diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-29 23:41:18 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-29 23:41:18 +0200 |
| commit | 6631424fd2efd75e7394b318ad2a8597327857a9 (patch) | |
| tree | 09cc31036c9c53c5faec578ad68d443fd53e1b3d /lib/prio_heap.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff) | |
| parent | r8169: offical fix for CVE-2009-4537 (overlength frame DMAs) (diff) | |
| download | linux-6631424fd2efd75e7394b318ad2a8597327857a9.tar.xz linux-6631424fd2efd75e7394b318ad2a8597327857a9.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: (33 commits)
r8169: offical fix for CVE-2009-4537 (overlength frame DMAs)
ipv6: Don't drop cache route entry unless timer actually expired.
tulip: Add missing parens.
r8169: fix broken register writes
pcnet_cs: add new id
bonding: fix broken multicast with round-robin mode
drivers/net: Fix continuation lines
e1000: do not modify tx_queue_len on link speed change
net: ipmr/ip6mr: prevent out-of-bounds vif_table access
ixgbe: Do not run all Diagnostic offline tests when VFs are active
igb: use correct bits to identify if managability is enabled
benet: Fix compile warnnings in drivers/net/benet/be_ethtool.c
net: Add MSG_WAITFORONE flag to recvmmsg
e1000e: do not modify tx_queue_len on link speed change
igbvf: do not modify tx_queue_len on link speed change
ipv4: Restart rt_intern_hash after emergency rebuild (v2)
ipv4: Cleanup struct net dereference in rt_intern_hash
net: fix netlink address dumping in IPv4/IPv6
tulip: Fix null dereference in uli526x_rx_packet()
gianfar: fix undo of reserve()
...
Diffstat (limited to 'lib/prio_heap.c')
0 files changed, 0 insertions, 0 deletions