diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-23 07:51:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-23 07:51:40 -0700 |
| commit | d5a92dd43739f59f77247cfbcbefd229e2948131 (patch) | |
| tree | a16124c41e4da74c2a5f8edbd278b96e9d295c71 /fs | |
| parent | d0b72a0817b0164986d35366c8ffe92fd985f713 (diff) | |
| parent | 4e8a5201506423e0241202de1349422af4260296 (diff) | |
| download | linux-d5a92dd43739f59f77247cfbcbefd229e2948131.tar.bz2 | |
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:
[PKT_SCHED] netem: Orphan SKB when adding to queue.
[NET]: kernel-doc fix for sock.h
[NET]: Reduce sizeof(struct flowi) by 20 bytes.
[IPv6] fib: initialize tb6_lock in common place to give lockdep a key
[ATM] nicstar: Fix a bogus casting warning
[ATM] firestream: handle thrown error
[ATM]: No need to return void
[ATM]: handle sysfs errors
[DCCP] ipv6: Fix opt_skb leak.
[DCCP]: Fix Oops in DCCPv6
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions