diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-23 15:29:27 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-23 15:29:27 -0800 |
| commit | 554f593d6c411e717a71ffdcb0cfb46bb2394502 (patch) | |
| tree | 338e1629408a66cfc84d199c18deb22c6e682c22 /drivers/block/loop.c | |
| parent | debf798b1ed82053689d900670eb27fb2f1b4bd3 (diff) | |
| parent | 95381c893dd71a534ab56f09b12a4e2118aa0f32 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[TG3]: Update driver version and reldate.
[TG3]: Add 5755 nvram support
[TG3]: Add 5755 support
[IPV6]: ip6_xmit: remove unnecessary NULL ptr check
[NET_SCHED]: cls_u32: remove unnecessary NULL-ptr check
[IPV4]: Add fib rule netlink notifications
[BNX2]: Update version and reldate
[BNX2]: Separate tx producer and consumer fields
[BNX2]: Move .h files to bnx2.c
[BNX2]: Combine small mem allocations
[BNX2]: Fix link change handling
[PKTGEN]: Add MPLS extension.
Diffstat (limited to 'drivers/block/loop.c')
0 files changed, 0 insertions, 0 deletions