]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 23 Oct 2006 14:51:40 +0000 (07:51 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 23 Oct 2006 14:51:40 +0000 (07:51 -0700)
commitd5a92dd43739f59f77247cfbcbefd229e2948131
treea16124c41e4da74c2a5f8edbd278b96e9d295c71
parentd0b72a0817b0164986d35366c8ffe92fd985f713
parent4e8a5201506423e0241202de1349422af4260296
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